Skip to content
Merged

typo #3523

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 2009-2024 the original author or authors.
* Copyright 2009-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 @@ -32,8 +32,9 @@
*
* <pre>{@code
* @CacheNamespace(implementation = CustomCache.class, properties = {
* &#064;Property(name = "host", value = "${mybatis.cache.host}"),
* &#064;Property(name = "port", value = "${mybatis.cache.port}"), &#064;Property(name = "name", value = "usersCache") })
* @Property(name = "host", value = "${mybatis.cache.host}"),
* @Property(name = "port", value = "${mybatis.cache.port}"),
* @Property(name = "name", value = "usersCache") })
* public interface UserMapper {
* // ...
* }
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/org/apache/ibatis/annotations/ConstructorArgs.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2024 the original author or authors.
* Copyright 2009-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 @@ -28,10 +28,10 @@
*
* <pre>{@code
* public interface UserMapper {
* @ConstructorArgs({ &#064;Arg(column = "id", javaType = int.class, id = true),
* &#064;Arg(column = "name", javaType = String.class),
* &#064;Arg(javaType = UserEmail.class, select = "selectUserEmailById", column = "id") })
* &#064;Select("SELECT id, name FROM users WHERE id = #{id}")
* @ConstructorArgs(value = { @Arg(column = "id", javaType = int.class, id = true),
* @Arg(column = "name", javaType = String.class),
* @Arg(javaType = UserEmail.class, select = "selectUserEmailById", column = "id") })
* @Select("SELECT id, name FROM users WHERE id = #{id}")
* User selectById(int id);
* }
* }</pre>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/apache/ibatis/annotations/Select.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2024 the original author or authors.
* Copyright 2009-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 @@ -41,7 +41,7 @@
*
* <pre>{@code
* public interface UserMapper {
* @Select({ "<script>", "select * from users", "where name = #{name}",
* @Select(value = { "<script>", "select * from users", "where name = #{name}",
* "<if test=\"age != null\"> age = #{age} </if>", "</script>" })
* User select(@NotNull String name, @Nullable Integer age);
* }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
*
* <pre>{@code
* public interface UserMapper {
* &#064;Select("SELECT id, name, type FROM users ORDER BY id")
* &#064;TypeDiscriminator(column = "type", javaType = String.class, cases = {
* &#064;Case(value = "1", type = PremiumUser.class), &#064;Case(value = "2", type = GeneralUser.class),
* &#064;Case(value = "3", type = TemporaryUser.class) })
* List&lt;User&gt; selectAll();
* @Select("SELECT id, name, type FROM users ORDER BY id")
* @TypeDiscriminator(column = "type", javaType = String.class, cases = {
* @Case(value = "1", type = PremiumUser.class), @Case(value = "2", type = GeneralUser.class),
* @Case(value = "3", type = TemporaryUser.class) })
* List<User> selectAll();
* }
* }</pre>
*
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/apache/ibatis/plugin/Intercepts.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2024 the original author or authors.
* Copyright 2009-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 @@ -27,9 +27,9 @@
* <b>How to use:</b>
*
* <pre>{@code
* @Intercepts({ &#064;Signature(type = Executor.class, method = "update", args = { MappedStatement.class, Object.class }) })
* @Intercepts(value = { @Signature(type = Executor.class, method = "update", args = { MappedStatement.class, Object.class }) })
* public class ExamplePlugin implements Interceptor {
* &#064;Override
* @Override
* public Object intercept(Invocation invocation) throws Throwable {
* // implement pre-processing if needed
* Object returnObject = invocation.proceed();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/apache/ibatis/type/SimpleTypeRegistry.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2023 the original author or authors.
* Copyright 2009-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 @@ -48,7 +48,7 @@ private SimpleTypeRegistry() {
// Prevent Instantiation
}

/*
/**
* Tells us if the class passed in is a known common type
* @param clazz The class to check
* @return True if the class is known
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class ExternalResourcesTest {
private File badFile;
private File tempFile;

/*
/**
* @throws java.lang.Exception
*/
@BeforeEach
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2022 the original author or authors.
* Copyright 2009-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 All @@ -17,7 +17,7 @@

import java.util.List;

/*
/**
* @author Jeff Butler
*/
public class Parameter {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2022 the original author or authors.
* Copyright 2009-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 All @@ -17,7 +17,7 @@

import java.util.List;

/*
/**
* @author Jeff Butler
*/
public class Parameter {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2024 the original author or authors.
* Copyright 2009-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 @@ -33,7 +33,7 @@
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

/*
/**
* Test for NPE when using extends.
*
* @author poitrac
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

/*
/**
* @author jjensen
*/
class FooMapperTest {
Expand Down
Loading