Skip to content

Commit 70dfaa9

Browse files
author
willie
committed
mybatis#101 Remove disabled performance test and data
Clean up all unrelated changes
1 parent 0c52fa4 commit 70dfaa9

File tree

6 files changed

+10
-586
lines changed

6 files changed

+10
-586
lines changed

src/test/java/org/apache/ibatis/domain/blog/immutable/ComplexImmutableAuthor.java renamed to src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthor.java

Lines changed: 2 additions & 4 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.
@@ -13,12 +13,10 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.apache.ibatis.domain.blog.immutable;
16+
package org.apache.ibatis.domain.blog;
1717

1818
import java.io.Serializable;
1919

20-
import org.apache.ibatis.domain.blog.Section;
21-
2220
public class ComplexImmutableAuthor implements Serializable {
2321
private static final long serialVersionUID = 1L;
2422
private final ComplexImmutableAuthorId theComplexImmutableAuthorId;

src/test/java/org/apache/ibatis/domain/blog/immutable/ComplexImmutableAuthorId.java renamed to src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthorId.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-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.
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.apache.ibatis.domain.blog.immutable;
16+
package org.apache.ibatis.domain.blog;
1717

1818
public class ComplexImmutableAuthorId {
1919
protected final int id;

src/test/java/org/apache/ibatis/submitted/collection_injection/PropertyVsConstructorPerformanceTest.java

Lines changed: 0 additions & 107 deletions
This file was deleted.

src/test/resources/org/apache/ibatis/builder/AuthorMapper.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
</constructor>
4747
</resultMap>
4848

49-
<resultMap id="complexAuthorId" type="org.apache.ibatis.domain.blog.immutable.ComplexImmutableAuthorId">
49+
<resultMap id="complexAuthorId" type="org.apache.ibatis.domain.blog.ComplexImmutableAuthorId">
5050
<constructor>
5151
<idArg column="id" javaType="_int" />
5252
<idArg column="username" javaType="string" />
@@ -55,9 +55,9 @@
5555
</constructor>
5656
</resultMap>
5757

58-
<resultMap id="selectComplexImmutableAuthor" type="org.apache.ibatis.domain.blog.immutable.ComplexImmutableAuthor">
58+
<resultMap id="selectComplexImmutableAuthor" type="org.apache.ibatis.domain.blog.ComplexImmutableAuthor">
5959
<constructor>
60-
<idArg javaType="org.apache.ibatis.domain.blog.immutable.ComplexImmutableAuthorId"
60+
<idArg javaType="org.apache.ibatis.domain.blog.ComplexImmutableAuthorId"
6161
resultMap="complexAuthorId" />
6262
<arg column="bio" javaType="string" />
6363
<arg column="favourite_section" javaType="org.apache.ibatis.domain.blog.Section" />

src/test/resources/org/apache/ibatis/builder/xsd/AuthorMapper.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</constructor>
4646
</resultMap>
4747

48-
<resultMap id="complexAuthorId" type="org.apache.ibatis.domain.blog.immutable.ComplexImmutableAuthorId">
48+
<resultMap id="complexAuthorId" type="org.apache.ibatis.domain.blog.ComplexImmutableAuthorId">
4949
<constructor>
5050
<idArg column="id" javaType="_int" />
5151
<idArg column="username" javaType="string" />
@@ -54,9 +54,9 @@
5454
</constructor>
5555
</resultMap>
5656

57-
<resultMap id="selectComplexImmutableAuthor" type="org.apache.ibatis.domain.blog.immutable.ComplexImmutableAuthor">
57+
<resultMap id="selectComplexImmutableAuthor" type="org.apache.ibatis.domain.blog.ComplexImmutableAuthor">
5858
<constructor>
59-
<idArg javaType="org.apache.ibatis.domain.blog.immutable.ComplexImmutableAuthorId"
59+
<idArg javaType="org.apache.ibatis.domain.blog.ComplexImmutableAuthorId"
6060
resultMap="complexAuthorId" />
6161
<arg column="bio" javaType="string" />
6262
<arg column="favourite_section" javaType="org.apache.ibatis.domain.blog.Section" />

0 commit comments

Comments
 (0)