Skip to content

Commit 1385892

Browse files
committed
Added license header, applied formatter, removed redundant access modifier
1 parent 1c4700a commit 1385892

File tree

11 files changed

+124
-16
lines changed

11 files changed

+124
-16
lines changed

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

Lines changed: 1 addition & 1 deletion
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.

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

Lines changed: 1 addition & 1 deletion
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.

src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java

Lines changed: 1 addition & 1 deletion
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.

src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_columnprefix/CreateDB.sql

Lines changed: 1 addition & 1 deletion
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.

src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_columnprefix/OneManyResultMapTest.java renamed to src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_columnprefix/OneManyColumnPrefixTest.java

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/**
2+
* Copyright 2009-2020 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
116
package org.apache.ibatis.submitted.annotion_many_one_add_columnprefix;
217

318
import org.apache.ibatis.BaseDataTest;
@@ -13,7 +28,7 @@
1328
import java.io.Reader;
1429
import java.util.List;
1530

16-
class OneManyResultMapTest {
31+
class OneManyColumnPrefixTest {
1732

1833
private static SqlSessionFactory sqlSessionFactory;
1934

@@ -33,7 +48,7 @@ static void setUp() throws Exception {
3348
@Test
3449
void shouldUseColumnPrefixWithMany() {
3550
try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
36-
UserDao mapper = sqlSession.getMapper(UserDao.class);
51+
UserDao mapper = sqlSession.getMapper(UserDao.class);
3752
List<User> users = mapper.findAll();
3853
assertNotNull(users);
3954
assertEquals(4, users.size());
@@ -44,7 +59,7 @@ void shouldUseColumnPrefixWithMany() {
4459
@Test
4560
void shouldUseColumnPrefixInXmlWithMany() {
4661
try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
47-
UserDao mapper = sqlSession.getMapper(UserDao.class);
62+
UserDao mapper = sqlSession.getMapper(UserDao.class);
4863
List<User> users = mapper.findAll2();
4964
assertNotNull(users);
5065
assertEquals(4, users.size());
@@ -55,7 +70,7 @@ void shouldUseColumnPrefixInXmlWithMany() {
5570
@Test
5671
void shouldUseColumnPrefixWithOne() {
5772
try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
58-
UserDao mapper = sqlSession.getMapper(UserDao.class);
73+
UserDao mapper = sqlSession.getMapper(UserDao.class);
5974
List<User> users = mapper.findAll3();
6075
assertNotNull(users);
6176
assertEquals(2, users.size());

src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_columnprefix/Role.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/**
2+
* Copyright 2009-2020 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
116
package org.apache.ibatis.submitted.annotion_many_one_add_columnprefix;
217

318
public class Role {

src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_columnprefix/RoleDao.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/**
2+
* Copyright 2009-2020 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
116
package org.apache.ibatis.submitted.annotion_many_one_add_columnprefix;
217

318
import org.apache.ibatis.annotations.Result;

src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_columnprefix/RoleDao.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Copyright 2009-2020 the original author or authors.
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
18+
-->
219
<!DOCTYPE mapper
320
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
421
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">

src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_columnprefix/SqlMapConfig.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
2+
<!--
3+
4+
Copyright 2009-2020 the original author or authors.
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
18+
-->
219
<!DOCTYPE configuration
320
PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
421
"http://mybatis.org/dtd/mybatis-3-config.dtd">

src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_columnprefix/User.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/**
2+
* Copyright 2009-2020 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
116
package org.apache.ibatis.submitted.annotion_many_one_add_columnprefix;
217

318
import java.util.List;

0 commit comments

Comments
 (0)