Skip to content

Commit 1e38efb

Browse files
authored
Merge pull request #3523 from guanchengang/typo
typo
2 parents 675341d + 9f15086 commit 1e38efb

File tree

11 files changed

+29
-28
lines changed

11 files changed

+29
-28
lines changed

src/main/java/org/apache/ibatis/annotations/CacheNamespace.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2024 the original author or authors.
2+
* Copyright 2009-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.
@@ -32,8 +32,9 @@
3232
*
3333
* <pre>{@code
3434
* @CacheNamespace(implementation = CustomCache.class, properties = {
35-
* &#064;Property(name = "host", value = "${mybatis.cache.host}"),
36-
* &#064;Property(name = "port", value = "${mybatis.cache.port}"), &#064;Property(name = "name", value = "usersCache") })
35+
* @Property(name = "host", value = "${mybatis.cache.host}"),
36+
* @Property(name = "port", value = "${mybatis.cache.port}"),
37+
* @Property(name = "name", value = "usersCache") })
3738
* public interface UserMapper {
3839
* // ...
3940
* }

src/main/java/org/apache/ibatis/annotations/ConstructorArgs.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2024 the original author or authors.
2+
* Copyright 2009-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.
@@ -28,10 +28,10 @@
2828
*
2929
* <pre>{@code
3030
* public interface UserMapper {
31-
* @ConstructorArgs({ &#064;Arg(column = "id", javaType = int.class, id = true),
32-
* &#064;Arg(column = "name", javaType = String.class),
33-
* &#064;Arg(javaType = UserEmail.class, select = "selectUserEmailById", column = "id") })
34-
* &#064;Select("SELECT id, name FROM users WHERE id = #{id}")
31+
* @ConstructorArgs(value = { @Arg(column = "id", javaType = int.class, id = true),
32+
* @Arg(column = "name", javaType = String.class),
33+
* @Arg(javaType = UserEmail.class, select = "selectUserEmailById", column = "id") })
34+
* @Select("SELECT id, name FROM users WHERE id = #{id}")
3535
* User selectById(int id);
3636
* }
3737
* }</pre>

src/main/java/org/apache/ibatis/annotations/Select.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2024 the original author or authors.
2+
* Copyright 2009-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.
@@ -41,7 +41,7 @@
4141
*
4242
* <pre>{@code
4343
* public interface UserMapper {
44-
* @Select({ "<script>", "select * from users", "where name = #{name}",
44+
* @Select(value = { "<script>", "select * from users", "where name = #{name}",
4545
* "<if test=\"age != null\"> age = #{age} </if>", "</script>" })
4646
* User select(@NotNull String name, @Nullable Integer age);
4747
* }

src/main/java/org/apache/ibatis/annotations/TypeDiscriminator.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
*
3333
* <pre>{@code
3434
* public interface UserMapper {
35-
* &#064;Select("SELECT id, name, type FROM users ORDER BY id")
36-
* &#064;TypeDiscriminator(column = "type", javaType = String.class, cases = {
37-
* &#064;Case(value = "1", type = PremiumUser.class), &#064;Case(value = "2", type = GeneralUser.class),
38-
* &#064;Case(value = "3", type = TemporaryUser.class) })
39-
* List&lt;User&gt; selectAll();
35+
* @Select("SELECT id, name, type FROM users ORDER BY id")
36+
* @TypeDiscriminator(column = "type", javaType = String.class, cases = {
37+
* @Case(value = "1", type = PremiumUser.class), @Case(value = "2", type = GeneralUser.class),
38+
* @Case(value = "3", type = TemporaryUser.class) })
39+
* List<User> selectAll();
4040
* }
4141
* }</pre>
4242
*

src/main/java/org/apache/ibatis/plugin/Intercepts.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2024 the original author or authors.
2+
* Copyright 2009-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.
@@ -27,9 +27,9 @@
2727
* <b>How to use:</b>
2828
*
2929
* <pre>{@code
30-
* @Intercepts({ &#064;Signature(type = Executor.class, method = "update", args = { MappedStatement.class, Object.class }) })
30+
* @Intercepts(value = { @Signature(type = Executor.class, method = "update", args = { MappedStatement.class, Object.class }) })
3131
* public class ExamplePlugin implements Interceptor {
32-
* &#064;Override
32+
* @Override
3333
* public Object intercept(Invocation invocation) throws Throwable {
3434
* // implement pre-processing if needed
3535
* Object returnObject = invocation.proceed();

src/main/java/org/apache/ibatis/type/SimpleTypeRegistry.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2023 the original author or authors.
2+
* Copyright 2009-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.
@@ -48,7 +48,7 @@ private SimpleTypeRegistry() {
4848
// Prevent Instantiation
4949
}
5050

51-
/*
51+
/**
5252
* Tells us if the class passed in is a known common type
5353
* @param clazz The class to check
5454
* @return True if the class is known

src/test/java/org/apache/ibatis/io/ExternalResourcesTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class ExternalResourcesTest {
3939
private File badFile;
4040
private File tempFile;
4141

42-
/*
42+
/**
4343
* @throws java.lang.Exception
4444
*/
4545
@BeforeEach

src/test/java/org/apache/ibatis/submitted/dynsql/Parameter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 the original author or authors.
2+
* Copyright 2009-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.
@@ -17,7 +17,7 @@
1717

1818
import java.util.List;
1919

20-
/*
20+
/**
2121
* @author Jeff Butler
2222
*/
2323
public class Parameter {

src/test/java/org/apache/ibatis/submitted/dynsql2/Parameter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 the original author or authors.
2+
* Copyright 2009-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.
@@ -17,7 +17,7 @@
1717

1818
import java.util.List;
1919

20-
/*
20+
/**
2121
* @author Jeff Butler
2222
*/
2323
public class Parameter {

src/test/java/org/apache/ibatis/submitted/extends_with_constructor/NpeExtendsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2024 the original author or authors.
2+
* Copyright 2009-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.
@@ -33,7 +33,7 @@
3333
import org.junit.jupiter.api.BeforeAll;
3434
import org.junit.jupiter.api.Test;
3535

36-
/*
36+
/**
3737
* Test for NPE when using extends.
3838
*
3939
* @author poitrac

0 commit comments

Comments
 (0)