Skip to content

Commit 0b90b66

Browse files
committed
[ci] Formatting
1 parent 5b5ca2d commit 0b90b66

File tree

76 files changed

+794
-709
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+794
-709
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2019 the original author or authors.
2+
* Copyright 2009-2020 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.
@@ -49,6 +49,6 @@
4949
*/
5050
@Documented
5151
@Retention(RetentionPolicy.RUNTIME)
52-
@Target({ElementType.CONSTRUCTOR})
52+
@Target({ ElementType.CONSTRUCTOR })
5353
public @interface AutomapConstructor {
5454
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@
7474
* If this attribute omit, the MyBatis will call a method that decide by following rules.
7575
* <ul>
7676
* <li>
77-
* If class that specified the {@link #type()} attribute implements the {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver},
77+
* If class that specified the {@link #type()} attribute implements the
78+
* {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver},
7879
* the MyBatis use a method that returned by it
7980
* </li>
8081
* <li>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@
7575
* If this attribute omit, the MyBatis will call a method that decide by following rules.
7676
* <ul>
7777
* <li>
78-
* If class that specified the {@link #type()} attribute implements the {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver},
78+
* If class that specified the {@link #type()} attribute implements the
79+
* {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver},
7980
* the MyBatis use a method that returned by it
8081
* </li>
8182
* <li>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@
7575
* If this attribute omit, the MyBatis will call a method that decide by following rules.
7676
* <ul>
7777
* <li>
78-
* If class that specified the {@link #type()} attribute implements the {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver},
78+
* If class that specified the {@link #type()} attribute implements the
79+
* {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver},
7980
* the MyBatis use a method that returned by it
8081
* </li>
8182
* <li>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@
7575
* If this attribute omit, the MyBatis will call a method that decide by following rules.
7676
* <ul>
7777
* <li>
78-
* If class that specified the {@link #type()} attribute implements the {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver},
78+
* If class that specified the {@link #type()} attribute implements the
79+
* {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver},
7980
* the MyBatis use a method that returned by it
8081
* </li>
8182
* <li>
Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2015 the original author or authors.
2+
* Copyright 2009-2020 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.
@@ -18,25 +18,31 @@
1818
import java.io.Serializable;
1919

2020
public class Person implements Serializable {
21-
private Integer id;
22-
private String firstName;
23-
private String lastName;
24-
public String getFirstName() {
25-
return firstName;
26-
}
27-
public void setFirstName(String firstName) {
28-
this.firstName = firstName;
29-
}
30-
public String getLastName() {
31-
return lastName;
32-
}
33-
public void setLastName(String lastName) {
34-
this.lastName = lastName;
35-
}
36-
public Integer getId() {
37-
return id;
38-
}
39-
public void setId(Integer id) {
40-
this.id = id;
41-
}
21+
private Integer id;
22+
private String firstName;
23+
private String lastName;
24+
25+
public String getFirstName() {
26+
return firstName;
27+
}
28+
29+
public void setFirstName(String firstName) {
30+
this.firstName = firstName;
31+
}
32+
33+
public String getLastName() {
34+
return lastName;
35+
}
36+
37+
public void setLastName(String lastName) {
38+
this.lastName = lastName;
39+
}
40+
41+
public Integer getId() {
42+
return id;
43+
}
44+
45+
public void setId(Integer id) {
46+
this.id = id;
47+
}
4248
}

src/test/java/org/apache/ibatis/submitted/orphan_result_maps/OrphanResultMapTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,21 @@ class OrphanResultMapTest {
2828

2929
@Test
3030
void testSeparateResultMaps() {
31-
//given
31+
// given
3232
Configuration configuration = new Configuration();
3333
configuration.getTypeAliasRegistry().registerAlias(Blog.class);
3434
configuration.getTypeAliasRegistry().registerAlias(Post.class);
3535
configuration.addMapper(SeparateCollectionMapper.class);
3636

37-
//there should be two result maps declared, with two name variants each
37+
// there should be two result maps declared, with two name variants each
3838
assertEquals(4, configuration.getResultMaps().size());
3939

40-
//test short names
40+
// test short names
4141
assertNotNull(configuration.getResultMap(RESULT_MAP_BLOG));
4242
assertNotNull(configuration.getResultMap(RESULT_MAP_POST));
4343
assertThrows(IllegalArgumentException.class, () -> configuration.getResultMap(RESULT_MAP_INNER));
4444

45-
//test long names
45+
// test long names
4646
String prefix = SeparateCollectionMapper.class.getName() + ".";
4747
assertNotNull(configuration.getResultMap(prefix + RESULT_MAP_BLOG));
4848
assertNotNull(configuration.getResultMap(prefix + RESULT_MAP_POST));
@@ -51,20 +51,20 @@ void testSeparateResultMaps() {
5151

5252
@Test
5353
void testNestedResultMap() {
54-
//given
54+
// given
5555
Configuration configuration = new Configuration();
5656
configuration.getTypeAliasRegistry().registerAlias(Blog.class);
5757
configuration.getTypeAliasRegistry().registerAlias(Post.class);
5858
configuration.addMapper(NestedCollectionMapper.class);
5959

60-
//there should be two result maps declared, with two name variants each
60+
// there should be two result maps declared, with two name variants each
6161
assertEquals(4, configuration.getResultMaps().size());
6262

63-
//test short names
63+
// test short names
6464
assertNotNull(configuration.getResultMap(RESULT_MAP_BLOG));
6565
assertNotNull(configuration.getResultMap(RESULT_MAP_INNER));
6666

67-
//test long names
67+
// test long names
6868
String prefix = NestedCollectionMapper.class.getName() + ".";
6969
assertNotNull(configuration.getResultMap(prefix + RESULT_MAP_BLOG));
7070
assertNotNull(configuration.getResultMap(prefix + RESULT_MAP_INNER));

src/test/java/org/apache/ibatis/submitted/overwritingproperties/FooMapperTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2019 the original author or authors.
2+
* Copyright 2009-2020 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.
@@ -45,7 +45,7 @@ static void setUpBeforeClass() throws Exception {
4545
conn = session.getConnection();
4646

4747
BaseDataTest.runScript(factory.getConfiguration().getEnvironment().getDataSource(),
48-
"org/apache/ibatis/submitted/overwritingproperties/create-schema-mysql.sql");
48+
"org/apache/ibatis/submitted/overwritingproperties/create-schema-mysql.sql");
4949
}
5050

5151
@BeforeEach
@@ -70,7 +70,7 @@ void testOverwriteWithDefault() {
7070

7171
// field4 is not mapped in the result map
7272
// <result property="field4" column="field3" jdbcType="INTEGER"/>
73-
Assertions.assertEquals(inserted.getField3(), selected.getField4() );
73+
Assertions.assertEquals(inserted.getField3(), selected.getField4());
7474

7575
// field4 is explicitly remapped to field3 in the resultmap
7676
// <result property="field3" column="field4" jdbcType="INTEGER"/>

src/test/java/org/apache/ibatis/submitted/parametrizedlist/ParametrizedListTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ void setUp() throws Exception {
3939
}
4040

4141
BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
42-
"org/apache/ibatis/submitted/parametrizedlist/CreateDB.sql");
42+
"org/apache/ibatis/submitted/parametrizedlist/CreateDB.sql");
4343
}
4444

4545
@Test

src/test/java/org/apache/ibatis/submitted/parent_childs/Mapper.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
public interface Mapper {
2121

2222
List<Parent> getParents();
23+
2324
List<Parent> getParentsWithConstructor();
2425

2526
}

0 commit comments

Comments
 (0)