Skip to content

Commit 312b4ff

Browse files
authored
Merge pull request #2790 from hazendaz/formatting
Road toward turning on auto formatting
2 parents 309bed7 + 553db6f commit 312b4ff

File tree

71 files changed

+551
-387
lines changed

Some content is hidden

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

71 files changed

+551
-387
lines changed

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 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.
@@ -30,6 +30,7 @@
3030
* The annotation that specify a mapping definition for the constructor argument.
3131
*
3232
* @see ConstructorArgs
33+
*
3334
* @author Clinton Begin
3435
*/
3536
@Documented
@@ -91,6 +92,7 @@
9192
* Returns the parameter name for applying this mapping.
9293
*
9394
* @return the parameter name
95+
*
9496
* @since 3.4.3
9597
*/
9698
String name() default "";
@@ -99,6 +101,7 @@
99101
* Returns the column prefix that use when applying {@link #resultMap()}.
100102
*
101103
* @return the column prefix
104+
*
102105
* @since 3.5.0
103106
*/
104107
String columnPrefix() default "";

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 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.
@@ -23,7 +23,6 @@
2323

2424
/**
2525
* The marker annotation that indicate a constructor for automatic mapping.
26-
*
2726
* <p>
2827
* <b>How to use:</b>
2928
*
@@ -47,6 +46,7 @@
4746
* </pre>
4847
*
4948
* @author Tim Chen
49+
*
5050
* @since 3.4.3
5151
*/
5252
@Documented

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 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.
@@ -27,7 +27,6 @@
2727

2828
/**
2929
* The annotation that specify to use cache on namespace(e.g. mapper interface).
30-
*
3130
* <p>
3231
* <b>How to use:</b>
3332
*
@@ -96,6 +95,7 @@
9695
* Returns property values for a implementation object.
9796
*
9897
* @return property values
98+
*
9999
* @since 3.4.2
100100
*/
101101
Property[] properties() default {};

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 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.
@@ -23,9 +23,8 @@
2323

2424
/**
2525
* The annotation that reference a cache.
26-
*
27-
* <p>If you use this annotation, should be specified either {@link #value()} or {@link #name()} attribute.
28-
*
26+
* <p>
27+
* If you use this annotation, should be specified either {@link #value()} or {@link #name()} attribute.
2928
* <p>
3029
* <b>How to use:</b>
3130
*
@@ -55,6 +54,7 @@
5554
* Returns the namespace name to reference a cache.
5655
*
5756
* @return the namespace name
57+
*
5858
* @since 3.4.2
5959
*/
6060
String name() default "";

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 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.
@@ -28,6 +28,7 @@
2828
* @see Arg
2929
* @see Results
3030
* @see ConstructorArgs
31+
*
3132
* @author Clinton Begin
3233
*/
3334
@Documented

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 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.
@@ -23,7 +23,6 @@
2323

2424
/**
2525
* The annotation that be grouping mapping definitions for constructor.
26-
*
2726
* <p>
2827
* <b>How to use:</b>
2928
*

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 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.
@@ -24,7 +24,6 @@
2424

2525
/**
2626
* The annotation that specify an SQL for deleting record(s).
27-
*
2827
* <p>
2928
* <b>How to use:</b>
3029
*
@@ -51,13 +50,16 @@
5150

5251
/**
5352
* @return A database id that correspond this statement
53+
*
5454
* @since 3.5.5
5555
*/
5656
String databaseId() default "";
5757

5858
/**
5959
* The container annotation for {@link Delete}.
60+
*
6061
* @author Kazuki Shimizu
62+
*
6163
* @since 3.5.5
6264
*/
6365
@Documented

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

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 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.
@@ -24,7 +24,6 @@
2424

2525
/**
2626
* The annotation that specify a method that provide an SQL for deleting record(s).
27-
*
2827
* <p>
2928
* <b>How to use:</b>
3029
*
@@ -55,7 +54,9 @@
5554
* Specify a type that implements an SQL provider method.
5655
*
5756
* @return a type that implements an SQL provider method
57+
*
5858
* @since 3.5.2
59+
*
5960
* @see #type()
6061
*/
6162
Class<?> value() default void.class;
@@ -67,13 +68,13 @@
6768
* </p>
6869
*
6970
* @return a type that implements an SQL provider method
71+
*
7072
* @see #value()
7173
*/
7274
Class<?> type() default void.class;
7375

7476
/**
7577
* Specify a method for providing an SQL.
76-
*
7778
* <p>
7879
* Since 3.5.1, this attribute can omit.
7980
* If this attribute omit, the MyBatis will call a method that decide by following rules.
@@ -95,13 +96,16 @@
9596

9697
/**
9798
* @return A database id that correspond this provider
99+
*
98100
* @since 3.5.5
99101
*/
100102
String databaseId() default "";
101103

102104
/**
103105
* The container annotation for {@link DeleteProvider}.
106+
*
104107
* @author Kazuki Shimizu
108+
*
105109
* @since 3.5.5
106110
*/
107111
@Documented

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 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.
@@ -23,7 +23,6 @@
2323

2424
/**
2525
* The maker annotation that invoke a flush statements via Mapper interface.
26-
*
2726
* <p>
2827
* <b>How to use:</b>
2928
*
@@ -35,6 +34,7 @@
3534
* </pre>
3635
*
3736
* @since 3.3.0
37+
*
3838
* @author Kazuki Shimizu
3939
*/
4040
@Documented

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 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.
@@ -24,7 +24,6 @@
2424

2525
/**
2626
* The annotation that specify an SQL for inserting record(s).
27-
*
2827
* <p>
2928
* <b>How to use:</b>
3029
*
@@ -51,13 +50,16 @@
5150

5251
/**
5352
* @return A database id that correspond this statement
53+
*
5454
* @since 3.5.5
5555
*/
5656
String databaseId() default "";
5757

5858
/**
5959
* The container annotation for {@link Insert}.
60+
*
6061
* @author Kazuki Shimizu
62+
*
6163
* @since 3.5.5
6264
*/
6365
@Documented

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

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 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.
@@ -24,7 +24,6 @@
2424

2525
/**
2626
* The annotation that specify a method that provide an SQL for inserting record(s).
27-
*
2827
* <p>
2928
* <b>How to use:</b>
3029
*
@@ -55,7 +54,9 @@
5554
* Specify a type that implements an SQL provider method.
5655
*
5756
* @return a type that implements an SQL provider method
57+
*
5858
* @since 3.5.2
59+
*
5960
* @see #type()
6061
*/
6162
Class<?> value() default void.class;
@@ -67,13 +68,13 @@
6768
* </p>
6869
*
6970
* @return a type that implements an SQL provider method
71+
*
7072
* @see #value()
7173
*/
7274
Class<?> type() default void.class;
7375

7476
/**
7577
* Specify a method for providing an SQL.
76-
*
7778
* <p>
7879
* Since 3.5.1, this attribute can omit.
7980
* If this attribute omit, the MyBatis will call a method that decide by following rules.
@@ -95,13 +96,16 @@
9596

9697
/**
9798
* @return A database id that correspond this provider
99+
*
98100
* @since 3.5.5
99101
*/
100102
String databaseId() default "";
101103

102104
/**
103105
* The container annotation for {@link InsertProvider}.
106+
*
104107
* @author Kazuki Shimizu
108+
*
105109
* @since 3.5.5
106110
*/
107111
@Documented

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 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.
@@ -25,7 +25,6 @@
2525

2626
/**
2727
* The annotation that specify a {@link LanguageDriver} to use.
28-
*
2928
* <p>
3029
* <b>How to use:</b>
3130
*

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 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.
@@ -27,6 +27,7 @@
2727
*
2828
* @see Result
2929
* @see Results
30+
*
3031
* @author Clinton Begin
3132
*/
3233
@Documented
@@ -37,6 +38,7 @@
3738
* Returns the columnPrefix.
3839
*
3940
* @return the columnPrefix.
41+
*
4042
* @since 3.5.5
4143
*/
4244
String columnPrefix() default "";
@@ -45,6 +47,7 @@
4547
* Returns the result map id used to map collection.
4648
*
4749
* @return the result map id
50+
*
4851
* @since 3.5.5
4952
*/
5053
String resultMap() default "";

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 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.
@@ -23,7 +23,6 @@
2323

2424
/**
2525
* The annotation that specify the property name(or column name) for a key value of {@link java.util.Map}.
26-
*
2726
* <p>
2827
* <b>How to use:</b>
2928
*

0 commit comments

Comments
 (0)