Skip to content

Commit 685bafb

Browse files
harawataharawata
committed
isle -> aisle 😑
1 parent bc53e84 commit 685bafb

File tree

11 files changed

+110
-110
lines changed

11 files changed

+110
-110
lines changed

‎src/test/java/org/apache/ibatis/submitted/collection_in_constructor/Isle.java renamed to ‎src/test/java/org/apache/ibatis/submitted/collection_in_constructor/Aisle.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717

1818
import java.util.Objects;
1919

20-
public class Isle {
20+
public class Aisle {
2121

2222
private Integer id;
2323
private String name;
2424

25-
public Isle() {
25+
public Aisle() {
2626
super();
2727
}
2828

29-
public Isle(Integer id, String name) {
29+
public Aisle(Integer id, String name) {
3030
super();
3131
this.id = id;
3232
this.name = name;
@@ -58,15 +58,15 @@ public boolean equals(Object obj) {
5858
if (this == obj) {
5959
return true;
6060
}
61-
if (!(obj instanceof Isle)) {
61+
if (!(obj instanceof Aisle)) {
6262
return false;
6363
}
64-
Isle other = (Isle) obj;
64+
Aisle other = (Aisle) obj;
6565
return Objects.equals(id, other.id) && Objects.equals(name, other.name);
6666
}
6767

6868
@Override
6969
public String toString() {
70-
return "Isle [id=" + id + ", name=" + name + "]";
70+
return "Aisle [id=" + id + ", name=" + name + "]";
7171
}
7272
}

‎src/test/java/org/apache/ibatis/submitted/collection_in_constructor/CollectionInConstructorObjectFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class CollectionInConstructorObjectFactory extends DefaultObjectFactory {
2828
@Override
2929
public <T> T create(Class<T> type, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
3030
if (type == Store4.class) {
31-
return (T) Store4.builder().id((Integer) constructorArgs.get(0)).isles((List<Isle>) constructorArgs.get(1))
31+
return (T) Store4.builder().id((Integer) constructorArgs.get(0)).isles((List<Aisle>) constructorArgs.get(1))
3232
.build();
3333
}
3434
return super.create(type, constructorArgTypes, constructorArgs);

‎src/test/java/org/apache/ibatis/submitted/collection_in_constructor/CollectionInConstructorTest.java

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ void testSimple() {
5252
try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
5353
Mapper mapper = sqlSession.getMapper(Mapper.class);
5454
Store store = mapper.getAStore(1);
55-
List<Isle> isles = store.getIsles();
55+
List<Aisle> aisles = store.getAisles();
5656
Assertions.assertIterableEquals(
57-
Arrays.asList(new Isle(101, "Isle 101"), new Isle(102, "Isle 102"), new Isle(103, "Isle 103")), isles);
57+
Arrays.asList(new Aisle(101, "Aisle 101"), new Aisle(102, "Aisle 102"), new Aisle(103, "Aisle 103")), aisles);
5858
}
5959
}
6060

@@ -64,19 +64,19 @@ void testSimpleList() {
6464
Mapper mapper = sqlSession.getMapper(Mapper.class);
6565
List<Store> stores = mapper.getStores();
6666
Assertions.assertIterableEquals(
67-
Arrays.asList(new Isle(101, "Isle 101"), new Isle(102, "Isle 102"), new Isle(103, "Isle 103")),
68-
stores.get(0).getIsles());
69-
Assertions.assertTrue(stores.get(1).getIsles().isEmpty());
70-
Assertions.assertIterableEquals(Arrays.asList(new Isle(104, "Isle 104"), new Isle(105, "Isle 105")),
71-
stores.get(2).getIsles());
67+
Arrays.asList(new Aisle(101, "Aisle 101"), new Aisle(102, "Aisle 102"), new Aisle(103, "Aisle 103")),
68+
stores.get(0).getAisles());
69+
Assertions.assertTrue(stores.get(1).getAisles().isEmpty());
70+
Assertions.assertIterableEquals(Arrays.asList(new Aisle(104, "Aisle 104"), new Aisle(105, "Aisle 105")),
71+
stores.get(2).getAisles());
7272
}
7373
}
7474

7575
@Test
7676
void shouldEmptyListBeReturned() {
7777
try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
7878
Mapper mapper = sqlSession.getMapper(Mapper.class);
79-
Assertions.assertTrue(mapper.getAStore(2).getIsles().isEmpty());
79+
Assertions.assertTrue(mapper.getAStore(2).getAisles().isEmpty());
8080
}
8181
}
8282

@@ -86,11 +86,11 @@ void testTwoLists() {
8686
Mapper mapper = sqlSession.getMapper(Mapper.class);
8787
Store2 store = mapper.getAStore2(1);
8888
List<Clerk> clerks = store.getClerks();
89-
List<Isle> isles = store.getIsles();
89+
List<Aisle> aisles = store.getAisles();
9090
Assertions.assertIterableEquals(Arrays.asList(new Clerk(1001, "Clerk 1001"), new Clerk(1002, "Clerk 1002"),
9191
new Clerk(1003, "Clerk 1003"), new Clerk(1004, "Clerk 1004"), new Clerk(1005, "Clerk 1005")), clerks);
9292
Assertions.assertIterableEquals(
93-
Arrays.asList(new Isle(101, "Isle 101"), new Isle(102, "Isle 102"), new Isle(103, "Isle 103")), isles);
93+
Arrays.asList(new Aisle(101, "Aisle 101"), new Aisle(102, "Aisle 102"), new Aisle(103, "Aisle 103")), aisles);
9494
}
9595
}
9696

@@ -99,9 +99,9 @@ void testListOfStrings() {
9999
try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
100100
Mapper mapper = sqlSession.getMapper(Mapper.class);
101101
Store3 store = mapper.getAStore3(1);
102-
List<String> isleNames = store.getIsleNames();
103-
Assertions.assertEquals(3, isleNames.size());
104-
Assertions.assertIterableEquals(Arrays.asList("Isle 101", "Isle 102", "Isle 103"), isleNames);
102+
List<String> aisleNames = store.getAisleNames();
103+
Assertions.assertEquals(3, aisleNames.size());
104+
Assertions.assertIterableEquals(Arrays.asList("Aisle 101", "Aisle 102", "Aisle 103"), aisleNames);
105105
}
106106
}
107107

@@ -110,9 +110,9 @@ void testObjectWithBuilder() {
110110
try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
111111
Mapper mapper = sqlSession.getMapper(Mapper.class);
112112
Store4 store = mapper.getAStore4(1);
113-
List<Isle> isles = store.getIsles();
113+
List<Aisle> aisles = store.getAisles();
114114
Assertions.assertIterableEquals(
115-
Arrays.asList(new Isle(101, "Isle 101"), new Isle(102, "Isle 102"), new Isle(103, "Isle 103")), isles);
115+
Arrays.asList(new Aisle(101, "Aisle 101"), new Aisle(102, "Aisle 102"), new Aisle(103, "Aisle 103")), aisles);
116116
}
117117
}
118118

@@ -136,9 +136,9 @@ void testPartiallyImmutableObject() {
136136
try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
137137
Mapper mapper = sqlSession.getMapper(Mapper.class);
138138
Store6 store = mapper.getAStore6(1);
139-
List<Isle> isles = store.getIsles();
139+
List<Aisle> aisles = store.getAisles();
140140
Assertions.assertEquals("Store 1", store.getName());
141-
Assertions.assertEquals(3, isles.size());
141+
Assertions.assertEquals(3, aisles.size());
142142
}
143143
}
144144

@@ -147,9 +147,9 @@ void testTwoListsOfString() {
147147
try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
148148
Mapper mapper = sqlSession.getMapper(Mapper.class);
149149
Store7 store = mapper.getAStore7(1);
150-
List<String> isleNames = store.getIsleNames();
150+
List<String> aisleNames = store.getAisleNames();
151151
List<String> clerkNames = store.getClerkNames();
152-
Assertions.assertIterableEquals(Arrays.asList("Isle 101", "Isle 102", "Isle 103"), isleNames);
152+
Assertions.assertIterableEquals(Arrays.asList("Aisle 101", "Aisle 102", "Aisle 103"), aisleNames);
153153
Assertions.assertIterableEquals(
154154
Arrays.asList("Clerk 1001", "Clerk 1002", "Clerk 1003", "Clerk 1004", "Clerk 1005"), clerkNames);
155155
}
@@ -174,10 +174,10 @@ void testImmutableNestedObjects() {
174174
Arrays
175175
.asList(
176176
new Store(1, "Store 1",
177-
Arrays.asList(new Isle(101, "Isle 101"), new Isle(102, "Isle 102"),
178-
new Isle(103, "Isle 103"))),
177+
Arrays.asList(new Aisle(101, "Aisle 101"), new Aisle(102, "Aisle 102"),
178+
new Aisle(103, "Aisle 103"))),
179179
new Store(2, "Store 2", Collections.emptyList()),
180-
new Store(3, "Store 3", Arrays.asList(new Isle(104, "Isle 104"), new Isle(105, "Isle 105")))),
180+
new Store(3, "Store 3", Arrays.asList(new Aisle(104, "Aisle 104"), new Aisle(105, "Aisle 105")))),
181181
container.getStores());
182182
}
183183
}

‎src/test/java/org/apache/ibatis/submitted/collection_in_constructor/Store.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ public class Store {
2222

2323
private final Integer id;
2424
private final String name;
25-
private final List<Isle> isles;
25+
private final List<Aisle> aisles;
2626

27-
public Store(Integer id, String name, List<Isle> isles) {
27+
public Store(Integer id, String name, List<Aisle> aisles) {
2828
super();
2929
this.id = id;
3030
this.name = name;
31-
this.isles = isles;
31+
this.aisles = aisles;
3232
}
3333

3434
public Integer getId() {
@@ -39,13 +39,13 @@ public String getName() {
3939
return name;
4040
}
4141

42-
public List<Isle> getIsles() {
43-
return isles;
42+
public List<Aisle> getAisles() {
43+
return aisles;
4444
}
4545

4646
@Override
4747
public int hashCode() {
48-
return Objects.hash(id, isles, name);
48+
return Objects.hash(id, aisles, name);
4949
}
5050

5151
@Override
@@ -57,11 +57,11 @@ public boolean equals(Object obj) {
5757
return false;
5858
}
5959
Store other = (Store) obj;
60-
return Objects.equals(id, other.id) && Objects.equals(isles, other.isles) && Objects.equals(name, other.name);
60+
return Objects.equals(id, other.id) && Objects.equals(aisles, other.aisles) && Objects.equals(name, other.name);
6161
}
6262

6363
@Override
6464
public String toString() {
65-
return "Store [id=" + id + ", name=" + name + ", isles=" + isles + "]";
65+
return "Store [id=" + id + ", name=" + name + ", aisles=" + aisles + "]";
6666
}
6767
}

‎src/test/java/org/apache/ibatis/submitted/collection_in_constructor/Store2.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ public class Store2 {
2222

2323
private final Integer id;
2424
private final List<Clerk> clerks;
25-
private final List<Isle> isles;
25+
private final List<Aisle> aisles;
2626

27-
public Store2(Integer id, List<Clerk> clerks, List<Isle> isles) {
27+
public Store2(Integer id, List<Clerk> clerks, List<Aisle> aisles) {
2828
super();
2929
this.id = id;
3030
this.clerks = clerks;
31-
this.isles = isles;
31+
this.aisles = aisles;
3232
}
3333

3434
public Integer getId() {
@@ -39,13 +39,13 @@ public List<Clerk> getClerks() {
3939
return clerks;
4040
}
4141

42-
public List<Isle> getIsles() {
43-
return isles;
42+
public List<Aisle> getAisles() {
43+
return aisles;
4444
}
4545

4646
@Override
4747
public int hashCode() {
48-
return Objects.hash(clerks, id, isles);
48+
return Objects.hash(clerks, id, aisles);
4949
}
5050

5151
@Override
@@ -57,11 +57,11 @@ public boolean equals(Object obj) {
5757
return false;
5858
}
5959
Store2 other = (Store2) obj;
60-
return Objects.equals(clerks, other.clerks) && Objects.equals(id, other.id) && Objects.equals(isles, other.isles);
60+
return Objects.equals(clerks, other.clerks) && Objects.equals(id, other.id) && Objects.equals(aisles, other.aisles);
6161
}
6262

6363
@Override
6464
public String toString() {
65-
return "Store2 [id=" + id + ", clerks=" + clerks + ", isles=" + isles + "]";
65+
return "Store2 [id=" + id + ", clerks=" + clerks + ", aisles=" + aisles + "]";
6666
}
6767
}

‎src/test/java/org/apache/ibatis/submitted/collection_in_constructor/Store3.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,25 @@
2121
public class Store3 {
2222

2323
private final Integer id;
24-
private final List<String> isleNames;
24+
private final List<String> aisleNames;
2525

26-
public Store3(Integer id, List<String> isleNames) {
26+
public Store3(Integer id, List<String> aisleNames) {
2727
super();
2828
this.id = id;
29-
this.isleNames = isleNames;
29+
this.aisleNames = aisleNames;
3030
}
3131

3232
public Integer getId() {
3333
return id;
3434
}
3535

36-
public List<String> getIsleNames() {
37-
return isleNames;
36+
public List<String> getAisleNames() {
37+
return aisleNames;
3838
}
3939

4040
@Override
4141
public int hashCode() {
42-
return Objects.hash(id, isleNames);
42+
return Objects.hash(id, aisleNames);
4343
}
4444

4545
@Override
@@ -51,11 +51,11 @@ public boolean equals(Object obj) {
5151
return false;
5252
}
5353
Store3 other = (Store3) obj;
54-
return Objects.equals(id, other.id) && Objects.equals(isleNames, other.isleNames);
54+
return Objects.equals(id, other.id) && Objects.equals(aisleNames, other.aisleNames);
5555
}
5656

5757
@Override
5858
public String toString() {
59-
return "Store3 [id=" + id + ", isleNames=" + isleNames + "]";
59+
return "Store3 [id=" + id + ", aisleNames=" + aisleNames + "]";
6060
}
6161
}

‎src/test/java/org/apache/ibatis/submitted/collection_in_constructor/Store4.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,27 @@
2121
public class Store4 {
2222

2323
private final Integer id;
24-
private final List<Isle> isles;
24+
private final List<Aisle> aisles;
2525

2626
// Using different arg order than the <constructor> definition
2727
// to ensure the builder is used, see CollectionInConstructorObjectFactory.create
28-
Store4(List<Isle> isles, Integer id) {
28+
Store4(List<Aisle> aisles, Integer id) {
2929
super();
30-
this.isles = isles;
30+
this.aisles = aisles;
3131
this.id = id;
3232
}
3333

3434
public Integer getId() {
3535
return id;
3636
}
3737

38-
public List<Isle> getIsles() {
39-
return isles;
38+
public List<Aisle> getAisles() {
39+
return aisles;
4040
}
4141

4242
@Override
4343
public int hashCode() {
44-
return Objects.hash(id, isles);
44+
return Objects.hash(id, aisles);
4545
}
4646

4747
@Override
@@ -53,12 +53,12 @@ public boolean equals(Object obj) {
5353
return false;
5454
}
5555
Store4 other = (Store4) obj;
56-
return Objects.equals(id, other.id) && Objects.equals(isles, other.isles);
56+
return Objects.equals(id, other.id) && Objects.equals(aisles, other.aisles);
5757
}
5858

5959
@Override
6060
public String toString() {
61-
return "Store4 [id=" + id + ", isles=" + isles + "]";
61+
return "Store4 [id=" + id + ", aisles=" + aisles + "]";
6262
}
6363

6464
public static Store4Builder builder() {
@@ -67,14 +67,14 @@ public static Store4Builder builder() {
6767

6868
public static class Store4Builder {
6969
private Integer id;
70-
private List<Isle> isles;
70+
private List<Aisle> isles;
7171

7272
public Store4Builder id(Integer id) {
7373
this.id = id;
7474
return this;
7575
}
7676

77-
public Store4Builder isles(List<Isle> isles) {
77+
public Store4Builder isles(List<Aisle> isles) {
7878
this.isles = isles;
7979
return this;
8080
}

0 commit comments

Comments
 (0)