Skip to content

Commit 204a09c

Browse files
committed
mybatis#101: Remove unrelated formatting
1 parent c48c238 commit 204a09c

File tree

2 files changed

+25
-29
lines changed

2 files changed

+25
-29
lines changed

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

Lines changed: 25 additions & 27 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-2023 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.
@@ -25,33 +25,34 @@
2525
/**
2626
* The annotation that specify an SQL for retrieving record(s).
2727
* <p>
28-
* <b>How to use:</b> <br/>
28+
* <b>How to use:</b>
29+
* <br/>
2930
* <ul>
30-
* <li>Simple:
31-
*
32-
* <pre>
33-
* public interface UserMapper {
34-
* &#064;Select("SELECT id, name FROM users WHERE id = #{id}")
35-
* User selectById(int id);
36-
* }
37-
* </pre>
38-
*
39-
* </li>
40-
* <li>Dynamic SQL:
41-
*
42-
* <pre>
43-
* public interface UserMapper {
44-
* &#064;Select({ "&lt;script>", "select * from users", "where name = #{name}",
45-
* "&lt;if test=\"age != null\"> age = #{age} &lt;/if>", "&lt;/script>" })
46-
* User select(@NotNull String name, @Nullable Intger age);
47-
* }
48-
* </pre>
49-
*
50-
* </li>
31+
* <li>
32+
* Simple:
33+
* <pre>
34+
* public interface UserMapper {
35+
* &#064;Select("SELECT id, name FROM users WHERE id = #{id}")
36+
* User selectById(int id);
37+
* }
38+
* </pre>
39+
* </li>
40+
* <li>
41+
* Dynamic SQL:
42+
* <pre>
43+
* public interface UserMapper {
44+
* &#064;Select({"&lt;script>",
45+
* "select * from users",
46+
* "where name = #{name}",
47+
* "&lt;if test=\"age != null\"> age = #{age} &lt;/if>",
48+
* "&lt;/script>"})
49+
* User select(@NotNull String name, @Nullable Intger age);
50+
* }
51+
* </pre>
52+
* </li>
5153
* </ul>
5254
*
5355
* @author Clinton Begin
54-
*
5556
* @see <a href="https://mybatis.org/mybatis-3/dynamic-sql.html">How to use Dynamic SQL</a>
5657
*/
5758
@Documented
@@ -68,7 +69,6 @@
6869

6970
/**
7071
* @return A database id that correspond this statement
71-
*
7272
* @since 3.5.5
7373
*/
7474
String databaseId() default "";
@@ -78,7 +78,6 @@
7878
* e.g. RETURNING of PostgreSQL or OUTPUT of MS SQL Server.
7979
*
8080
* @return {@code true} if this select affects DB data; {@code false} if otherwise
81-
*
8281
* @since 3.5.12
8382
*/
8483
boolean affectData() default false;
@@ -87,7 +86,6 @@
8786
* The container annotation for {@link Select}.
8887
*
8988
* @author Kazuki Shimizu
90-
*
9189
* @since 3.5.5
9290
*/
9391
@Documented

src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,11 @@ public class DefaultResultSetHandler implements ResultSetHandler {
108108
private boolean useConstructorMappings;
109109

110110
private static class PendingRelation {
111-
112111
public MetaObject metaObject;
113112
public ResultMapping propertyMapping;
114113
}
115114

116115
private static class UnMappedColumnAutoMapping {
117-
118116
private final String column;
119117
private final String property;
120118
private final TypeHandler<?> typeHandler;

0 commit comments

Comments
 (0)