[ci] Formatting

hazendaz · hazendaz · commit fe65ae39cac8 · 2020-03-14T15:59:58.000-04:00
diff --git a/src/main/java/org/apache/ibatis/mapping/ResultMapping.java b/src/main/java/org/apache/ibatis/mapping/ResultMapping.java
@@ -250,7 +250,7 @@ public boolean isLazy() {
   public void setLazy(boolean lazy) {
     this.lazy = lazy;
   }
-  
+
   public boolean isSimple() {
     return this.nestedResultMapId == null && this.nestedQueryId == null && this.resultSet == null;
   }
diff --git a/src/site/zh/xdoc/sqlmap-xml.xml b/src/site/zh/xdoc/sqlmap-xml.xml
@@ -28,7 +28,7 @@
 
   <body>
     <section name="XML 映射器">
-      <p>MyBatis 的真正强大在于它的语句映射，这是它的魔力所在。由于它的异常强大，映射器的 
+      <p>MyBatis 的真正强大在于它的语句映射，这是它的魔力所在。由于它的异常强大，映射器的
       XML 文件就显得相对简单。如果拿它跟具有相同功能的 JDBC 代码进行对比，你会立即发现省掉了将近
       95% 的代码。MyBatis 致力于减少使用成本，让用户能更专注于 SQL 代码。</p>
       <p>SQL 映射文件只有很少的几个顶级元素（按照应被定义的顺序列出）：</p>
diff --git a/src/site/zh/xdoc/statement-builders.xml b/src/site/zh/xdoc/statement-builders.xml
@@ -400,7 +400,7 @@ public String updatePersonSql() {
               <td>
                 <code>UPDATE(String)</code>
               </td>
-              <td>开始新的 update 语句，并指定更新表的表名。后面都会跟着一个或多个 SET() 调用，通常也会有一个 WHERE() 调用。 
+              <td>开始新的 update 语句，并指定更新表的表名。后面都会跟着一个或多个 SET() 调用，通常也会有一个 WHERE() 调用。
               </td>
             </tr>
             <tr>
diff --git a/src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_columnprefix/UserDao.java b/src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_columnprefix/UserDao.java
@@ -76,10 +76,10 @@ public interface UserDao {
     "    from user u",
     "    left join user_role ur on u.id = ur.user_id",
     "    left join role r on ur.role_id = r.id" ,
-    "    left join user f on u.friend_id = f.id", 
+    "    left join user f on u.friend_id = f.id",
     "    left join user_role fur on f.id = fur.user_id",
     "    left join role fr on fur.role_id = fr.id" ,
-    "    where u.id = #{userId} order by r.id, fr.id" 
+    "    where u.id = #{userId} order by r.id, fr.id"
     })
   @Results(id = "userWithFriendMap", value = {
     @Result(id = true, column = "id", property = "id"),
diff --git a/src/test/java/org/apache/ibatis/submitted/parent_childs/Child.java b/src/test/java/org/apache/ibatis/submitted/parent_childs/Child.java
@@ -23,16 +23,16 @@ public class Child {
   private Integer age;
 
   public Child() {
-	  
+
   }
-  
+
   public Child(Integer id, String name, String surName, Integer age) {
     this.id = id;
     this.name = name;
     this.surName = surName;
     this.age = age;
   }
-  
+
   public Integer getId() {
     return id;
   }
diff --git a/src/test/java/org/apache/ibatis/submitted/parent_childs/Mapper.xml b/src/test/java/org/apache/ibatis/submitted/parent_childs/Mapper.xml
@@ -48,7 +48,7 @@
         from Parent p
         left outer join Child c on p.Id = c.ParentId
     </select>
-        
+
     <resultMap id="ParentMapConstructor" type="org.apache.ibatis.submitted.parent_childs.Parent">
         <result column="p_Id" property="id" />
         <result column="p_Name" property="name" />
@@ -64,7 +64,7 @@
 	        <arg column="c_Age" javaType="int"/>
         </constructor>
     </resultMap>
-    
+
     <select id="getParentsWithConstructor" resultMap="ParentMapConstructor">
         select
         p.Id as p_Id,
@@ -77,5 +77,5 @@
         from Parent p
         left outer join Child c on p.Id = c.ParentId
     </select>
-    
+
 </mapper>

Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ public boolean isLazy() {`
`250`	`250`	`public void setLazy(boolean lazy) {`
`251`	`251`	`this.lazy = lazy;`
`252`	`252`	`}`
`253`		`-`
	`253`	`+`
`254`	`254`	`public boolean isSimple() {`
`255`	`255`	`return this.nestedResultMapId == null && this.nestedQueryId == null && this.resultSet == null;`
`256`	`256`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,16 +23,16 @@ public class Child {`
`23`	`23`	`private Integer age;`
`24`	`24`
`25`	`25`	`public Child() {`
`26`		`-`
	`26`	`+`
`27`	`27`	`}`
`28`		`-`
	`28`	`+`
`29`	`29`	`public Child(Integer id, String name, String surName, Integer age) {`
`30`	`30`	`this.id = id;`
`31`	`31`	`this.name = name;`
`32`	`32`	`this.surName = surName;`
`33`	`33`	`this.age = age;`
`34`	`34`	`}`
`35`		`-`
	`35`	`+`
`36`	`36`	`public Integer getId() {`
`37`	`37`	`return id;`
`38`	`38`	`}`