Skip to content

Commit 6ef54c2

Browse files
committed
[javadocs] Fix all warnings generated during site build
1 parent f0557f6 commit 6ef54c2

30 files changed

+471
-73
lines changed

src/main/java/org/apache/ibatis/binding/MapperRegistry.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,22 @@ public <T> void addMapper(Class<T> type) {
8080
}
8181

8282
/**
83+
* Gets the mappers.
84+
*
85+
* @return the mappers
8386
* @since 3.2.2
8487
*/
8588
public Collection<Class<?>> getMappers() {
8689
return Collections.unmodifiableCollection(knownMappers.keySet());
8790
}
8891

8992
/**
93+
* Adds the mappers.
94+
*
95+
* @param packageName
96+
* the package name
97+
* @param superType
98+
* the super type
9099
* @since 3.2.2
91100
*/
92101
public void addMappers(String packageName, Class<?> superType) {
@@ -99,6 +108,10 @@ public void addMappers(String packageName, Class<?> superType) {
99108
}
100109

101110
/**
111+
* Adds the mappers.
112+
*
113+
* @param packageName
114+
* the package name
102115
* @since 3.2.2
103116
*/
104117
public void addMappers(String packageName) {

src/main/java/org/apache/ibatis/builder/MapperBuilderAssistant.java

Lines changed: 75 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,33 @@ private Class<?> resolveParameterJavaType(Class<?> resultType, String property,
454454
return javaType;
455455
}
456456

457-
/** Backward compatibility signature. */
457+
/**
458+
* Backward compatibility signature 'buildResultMapping'.
459+
*
460+
* @param resultType
461+
* the result type
462+
* @param property
463+
* the property
464+
* @param column
465+
* the column
466+
* @param javaType
467+
* the java type
468+
* @param jdbcType
469+
* the jdbc type
470+
* @param nestedSelect
471+
* the nested select
472+
* @param nestedResultMap
473+
* the nested result map
474+
* @param notNullColumn
475+
* the not null column
476+
* @param columnPrefix
477+
* the column prefix
478+
* @param typeHandler
479+
* the type handler
480+
* @param flags
481+
* the flags
482+
* @return the result mapping
483+
*/
458484
public ResultMapping buildResultMapping(Class<?> resultType, String property, String column, Class<?> javaType,
459485
JdbcType jdbcType, String nestedSelect, String nestedResultMap, String notNullColumn, String columnPrefix,
460486
Class<? extends TypeHandler<?>> typeHandler, List<ResultFlag> flags) {
@@ -464,14 +490,61 @@ public ResultMapping buildResultMapping(Class<?> resultType, String property, St
464490
}
465491

466492
/**
493+
* Gets the language driver.
494+
*
495+
* @param langClass
496+
* the lang class
497+
* @return the language driver
467498
* @deprecated Use {@link Configuration#getLanguageDriver(Class)}
468499
*/
469500
@Deprecated
470501
public LanguageDriver getLanguageDriver(Class<? extends LanguageDriver> langClass) {
471502
return configuration.getLanguageDriver(langClass);
472503
}
473504

474-
/** Backward compatibility signature. */
505+
/**
506+
* Backward compatibility signature 'addMappedStatement'.
507+
*
508+
* @param id
509+
* the id
510+
* @param sqlSource
511+
* the sql source
512+
* @param statementType
513+
* the statement type
514+
* @param sqlCommandType
515+
* the sql command type
516+
* @param fetchSize
517+
* the fetch size
518+
* @param timeout
519+
* the timeout
520+
* @param parameterMap
521+
* the parameter map
522+
* @param parameterType
523+
* the parameter type
524+
* @param resultMap
525+
* the result map
526+
* @param resultType
527+
* the result type
528+
* @param resultSetType
529+
* the result set type
530+
* @param flushCache
531+
* the flush cache
532+
* @param useCache
533+
* the use cache
534+
* @param resultOrdered
535+
* the result ordered
536+
* @param keyGenerator
537+
* the key generator
538+
* @param keyProperty
539+
* the key property
540+
* @param keyColumn
541+
* the key column
542+
* @param databaseId
543+
* the database id
544+
* @param lang
545+
* the lang
546+
* @return the mapped statement
547+
*/
475548
public MappedStatement addMappedStatement(String id, SqlSource sqlSource, StatementType statementType,
476549
SqlCommandType sqlCommandType, Integer fetchSize, Integer timeout, String parameterMap, Class<?> parameterType,
477550
String resultMap, Class<?> resultType, ResultSetType resultSetType, boolean flushCache, boolean useCache,

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

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,12 @@ public class ProviderSqlSource implements SqlSource {
4848
/**
4949
* This constructor will remove at a future version.
5050
*
51-
* @deprecated Since 3.5.3, Please use the {@link #ProviderSqlSource(Configuration, Annotation, Class, Method)} instead of this.
51+
* @param configuration
52+
* the configuration
53+
* @param provider
54+
* the provider
55+
* @deprecated Since 3.5.3, Please use the {@link #ProviderSqlSource(Configuration, Annotation, Class, Method)}
56+
* instead of this.
5257
*/
5358
@Deprecated
5459
public ProviderSqlSource(Configuration configuration, Object provider) {
@@ -58,6 +63,14 @@ public ProviderSqlSource(Configuration configuration, Object provider) {
5863
/**
5964
* This constructor will remove at a future version.
6065
*
66+
* @param configuration
67+
* the configuration
68+
* @param provider
69+
* the provider
70+
* @param mapperType
71+
* the mapper type
72+
* @param mapperMethod
73+
* the mapper method
6174
* @since 3.4.5
6275
* @deprecated Since 3.5.3, Please use the {@link #ProviderSqlSource(Configuration, Annotation, Class, Method)} instead of this.
6376
*/
@@ -67,6 +80,16 @@ public ProviderSqlSource(Configuration configuration, Object provider, Class<?>
6780
}
6881

6982
/**
83+
* Instantiates a new provider sql source.
84+
*
85+
* @param configuration
86+
* the configuration
87+
* @param provider
88+
* the provider
89+
* @param mapperType
90+
* the mapper type
91+
* @param mapperMethod
92+
* the mapper method
7093
* @since 3.5.3
7194
*/
7295
public ProviderSqlSource(Configuration configuration, Annotation provider, Class<?> mapperType, Method mapperMethod) {

src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSource.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,9 @@ public Properties getDriverProperties() {
276276
}
277277

278278
/**
279+
* Gets the default network timeout.
280+
*
281+
* @return the default network timeout
279282
* @since 3.5.2
280283
*/
281284
public Integer getDefaultNetworkTimeout() {

src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSource.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,9 @@ public void setDefaultTransactionIsolationLevel(Integer defaultTransactionIsolat
185185
}
186186

187187
/**
188+
* Gets the default network timeout.
189+
*
190+
* @return the default network timeout
188191
* @since 3.5.2
189192
*/
190193
public Integer getDefaultNetworkTimeout() {

src/main/java/org/apache/ibatis/executor/resultset/ResultSetWrapper.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,10 @@ public JdbcType getJdbcType(String columnName) {
9494
* If not found it gets the column JDBC type and tries to get a handler for it.
9595
*
9696
* @param propertyType
97+
* the property type
9798
* @param columnName
98-
* @return
99+
* the column name
100+
* @return the type handler
99101
*/
100102
public TypeHandler<?> getTypeHandler(Class<?> propertyType, String columnName) {
101103
TypeHandler<?> handler = null;

src/main/java/org/apache/ibatis/io/DefaultVFS.java

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ protected List<String> listResources(JarInputStream jar, String path) throws IOE
213213
* @param url The URL of the JAR entry.
214214
* @return The URL of the JAR file, if one is found. Null if not.
215215
* @throws MalformedURLException
216+
* the malformed URL exception
216217
*/
217218
protected URL findJarForResource(URL url) throws MalformedURLException {
218219
if (log.isDebugEnabled()) {
@@ -294,7 +295,9 @@ protected URL findJarForResource(URL url) throws MalformedURLException {
294295
* Converts a Java package name to a path that can be looked up with a call to
295296
* {@link ClassLoader#getResources(String)}.
296297
*
297-
* @param packageName The Java package name to convert to a path
298+
* @param packageName
299+
* The Java package name to convert to a path
300+
* @return the package path
298301
*/
299302
protected String getPackagePath(String packageName) {
300303
return packageName == null ? null : packageName.replace('.', '/');
@@ -303,7 +306,9 @@ protected String getPackagePath(String packageName) {
303306
/**
304307
* Returns true if the resource located at the given URL is a JAR file.
305308
*
306-
* @param url The URL of the resource to test.
309+
* @param url
310+
* The URL of the resource to test.
311+
* @return true, if is jar
307312
*/
308313
protected boolean isJar(URL url) {
309314
return isJar(url, new byte[JAR_MAGIC.length]);
@@ -312,10 +317,12 @@ protected boolean isJar(URL url) {
312317
/**
313318
* Returns true if the resource located at the given URL is a JAR file.
314319
*
315-
* @param url The URL of the resource to test.
316-
* @param buffer A buffer into which the first few bytes of the resource are read. The buffer
317-
* must be at least the size of {@link #JAR_MAGIC}. (The same buffer may be reused
318-
* for multiple calls as an optimization.)
320+
* @param url
321+
* The URL of the resource to test.
322+
* @param buffer
323+
* A buffer into which the first few bytes of the resource are read. The buffer must be at least the size of
324+
* {@link #JAR_MAGIC}. (The same buffer may be reused for multiple calls as an optimization.)
325+
* @return true, if is jar
319326
*/
320327
protected boolean isJar(URL url, byte[] buffer) {
321328
InputStream is = null;

src/main/java/org/apache/ibatis/io/JBoss6VFS.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,10 @@ protected static synchronized void initialize() {
111111
* Verifies that the provided object reference is null. If it is null, then this VFS is marked
112112
* as invalid for the current environment.
113113
*
114-
* @param object The object reference to check for null.
114+
* @param <T> the generic type
115+
* @param object
116+
* The object reference to check for null.
117+
* @return the t
115118
*/
116119
protected static <T> T checkNotNull(T object) {
117120
if (object == null) {

src/main/java/org/apache/ibatis/io/ResolverUtil.java

Lines changed: 39 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,11 @@
5555
* </pre>
5656
*
5757
* @author Tim Fennell
58+
* @param <T> the generic type
5859
*/
5960
public class ResolverUtil<T> {
60-
/*
61+
62+
/**
6163
* An instance of Log to use for logging in this class.
6264
*/
6365
private static final Log log = LogFactory.getLog(ResolverUtil.class);
@@ -67,9 +69,13 @@ public class ResolverUtil<T> {
6769
* are to be included in the results produced by the ResolverUtil.
6870
*/
6971
public interface Test {
72+
7073
/**
7174
* Will be called repeatedly with candidate classes. Must return True if a class
7275
* is to be included in the results, false otherwise.
76+
*
77+
* @param type the type
78+
* @return true, if successful
7379
*/
7480
boolean matches(Class<?> type);
7581
}
@@ -79,9 +85,15 @@ public interface Test {
7985
* that this test will match the parent type itself if it is presented for matching.
8086
*/
8187
public static class IsA implements Test {
88+
89+
/** The parent. */
8290
private Class<?> parent;
8391

84-
/** Constructs an IsA test using the supplied Class as the parent class/interface. */
92+
/**
93+
* Constructs an IsA test using the supplied Class as the parent class/interface.
94+
*
95+
* @param parentType the parent type
96+
*/
8597
public IsA(Class<?> parentType) {
8698
this.parent = parentType;
8799
}
@@ -103,9 +115,15 @@ public String toString() {
103115
* is, then the test returns true, otherwise false.
104116
*/
105117
public static class AnnotatedWith implements Test {
118+
119+
/** The annotation. */
106120
private Class<? extends Annotation> annotation;
107121

108-
/** Constructs an AnnotatedWith test for the specified annotation type. */
122+
/**
123+
* Constructs an AnnotatedWith test for the specified annotation type.
124+
*
125+
* @param annotation the annotation
126+
*/
109127
public AnnotatedWith(Class<? extends Annotation> annotation) {
110128
this.annotation = annotation;
111129
}
@@ -167,8 +185,11 @@ public void setClassLoader(ClassLoader classloader) {
167185
* of a non-interface class, subclasses will be collected. Accumulated classes can be
168186
* accessed by calling {@link #getClasses()}.
169187
*
170-
* @param parent the class of interface to find subclasses or implementations of
171-
* @param packageNames one or more package names to scan (including subpackages) for classes
188+
* @param parent
189+
* the class of interface to find subclasses or implementations of
190+
* @param packageNames
191+
* one or more package names to scan (including subpackages) for classes
192+
* @return the resolver util
172193
*/
173194
public ResolverUtil<T> findImplementations(Class<?> parent, String... packageNames) {
174195
if (packageNames == null) {
@@ -187,8 +208,11 @@ public ResolverUtil<T> findImplementations(Class<?> parent, String... packageNam
187208
* Attempts to discover classes that are annotated with the annotation. Accumulated
188209
* classes can be accessed by calling {@link #getClasses()}.
189210
*
190-
* @param annotation the annotation that should be present on matching classes
191-
* @param packageNames one or more package names to scan (including subpackages) for classes
211+
* @param annotation
212+
* the annotation that should be present on matching classes
213+
* @param packageNames
214+
* one or more package names to scan (including subpackages) for classes
215+
* @return the resolver util
192216
*/
193217
public ResolverUtil<T> findAnnotated(Class<? extends Annotation> annotation, String... packageNames) {
194218
if (packageNames == null) {
@@ -209,9 +233,11 @@ public ResolverUtil<T> findAnnotated(Class<? extends Annotation> annotation, Str
209233
* true the class is retained. Accumulated classes can be fetched by calling
210234
* {@link #getClasses()}.
211235
*
212-
* @param test an instance of {@link Test} that will be used to filter classes
213-
* @param packageName the name of the package from which to start scanning for
214-
* classes, e.g. {@code net.sourceforge.stripes}
236+
* @param test
237+
* an instance of {@link Test} that will be used to filter classes
238+
* @param packageName
239+
* the name of the package from which to start scanning for classes, e.g. {@code net.sourceforge.stripes}
240+
* @return the resolver util
215241
*/
216242
public ResolverUtil<T> find(Test test, String packageName) {
217243
String path = getPackagePath(packageName);
@@ -234,7 +260,9 @@ public ResolverUtil<T> find(Test test, String packageName) {
234260
* Converts a Java package name to a path that can be looked up with a call to
235261
* {@link ClassLoader#getResources(String)}.
236262
*
237-
* @param packageName The Java package name to convert to a path
263+
* @param packageName
264+
* The Java package name to convert to a path
265+
* @return the package path
238266
*/
239267
protected String getPackagePath(String packageName) {
240268
return packageName == null ? null : packageName.replace('.', '/');

0 commit comments

Comments
 (0)