Skip to content

Commit 176b03b

Browse files
committed
Javadoc
1 parent 9828d7f commit 176b03b

14 files changed

Lines changed: 46 additions & 46 deletions

src/main/java/org/apache/commons/dbcp2/BasicDataSource.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ protected DataSource createDataSourceInstance() throws SQLException {
592592
* @param factory the object factory
593593
* @param poolConfig the object pool configuration
594594
* @param abandonedConfig the abandoned objects configuration
595-
* @return a non-null instance
595+
* @return A non-null instance
596596
*/
597597
protected GenericObjectPool<PoolableConnection> createObjectPool(final PoolableConnectionFactory factory,
598598
final GenericObjectPoolConfig<PoolableConnection> poolConfig, final AbandonedConfig abandonedConfig) {
@@ -708,7 +708,7 @@ public boolean getCacheState() {
708708
* Creates (if necessary) and return a connection to the database.
709709
*
710710
* @throws SQLException if a database access error occurs
711-
* @return a database connection
711+
* @return A database connection
712712
*/
713713
@Override
714714
public Connection getConnection() throws SQLException {
@@ -872,7 +872,7 @@ public int getDefaultTransactionIsolation() {
872872
* trigger a disconnection even if they match other disconnection criteria.
873873
* </p>
874874
*
875-
* @return a set of SQL State codes that should be ignored for disconnection checks, or an empty set if none have been specified.
875+
* @return A set of SQL State codes that should be ignored for disconnection checks, or an empty set if none have been specified.
876876
* @since 2.13.0
877877
*/
878878
public Set<String> getDisconnectionIgnoreSqlCodes() {

src/main/java/org/apache/commons/dbcp2/ConnectionFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public interface ConnectionFactory {
2929
/**
3030
* Create a new {@link Connection} in an implementation specific fashion.
3131
*
32-
* @return a new {@link Connection}
32+
* @return A new {@link Connection}
3333
* @throws SQLException
3434
* if a database error occurs creating the connection
3535
*/

src/main/java/org/apache/commons/dbcp2/ConnectionFactoryFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ final class ConnectionFactoryFactory {
3333
*
3434
* @param basicDataSource Configures creation.
3535
* @param driver The JDBC driver.
36-
* @return a new {@link DriverConnectionFactory} allowing for a {@link BasicDataSource#getDriverClassName()}
36+
* @return A new {@link DriverConnectionFactory} allowing for a {@link BasicDataSource#getDriverClassName()}
3737
* override.
3838
* @throws SQLException Thrown when instantiation fails.
3939
*/

src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS
6161
* The Connection which created the ResultSet.
6262
* @param resultSet
6363
* The ResultSet to wrap.
64-
* @return a new delegate.
64+
* @return A new delegate.
6565
*/
6666
public static ResultSet wrapResultSet(final Connection connection, final ResultSet resultSet) {
6767
if (resultSet == null) {
@@ -77,7 +77,7 @@ public static ResultSet wrapResultSet(final Connection connection, final ResultS
7777
* The Statement which created the ResultSet.
7878
* @param resultSet
7979
* The ResultSet to wrap.
80-
* @return a new delegate.
80+
* @return A new delegate.
8181
*/
8282
public static ResultSet wrapResultSet(final Statement statement, final ResultSet resultSet) {
8383
if (resultSet == null) {

src/main/java/org/apache/commons/dbcp2/PStmtKey.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ public boolean equals(final Object obj) {
539539
* Gets a flag indicating whether auto-generated keys should be returned; one of {@link Statement#RETURN_GENERATED_KEYS}
540540
* or {@link Statement#NO_GENERATED_KEYS}.
541541
*
542-
* @return a flag indicating whether auto-generated keys should be returned.
542+
* @return A flag indicating whether auto-generated keys should be returned.
543543
*/
544544
public Integer getAutoGeneratedKeys() {
545545
return autoGeneratedKeys;

src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ public int getDefaultTransactionIsolation() {
301301
* being treated as fatal even if they match the typical disconnection criteria.
302302
* </p>
303303
*
304-
* @return a {@link Collection} of SQL State codes that should be ignored for disconnection checks.
304+
* @return A {@link Collection} of SQL State codes that should be ignored for disconnection checks.
305305
* @since 2.13.0
306306
*/
307307
public Collection<String> getDisconnectionIgnoreSqlCodes() {

src/main/java/org/apache/commons/dbcp2/PoolingConnection.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ public void passivateObject(final PStmtKey key, final PooledObject<DelegatingPre
407407
*
408408
* @param key
409409
* a {@link PStmtKey} for the given arguments
410-
* @return a {@link PoolableCallableStatement}
410+
* @return A {@link PoolableCallableStatement}
411411
* @throws SQLException
412412
* Wraps an underlying exception.
413413
*/
@@ -420,7 +420,7 @@ private CallableStatement prepareCall(final PStmtKey key) throws SQLException {
420420
*
421421
* @param sql
422422
* the SQL string used to define the CallableStatement
423-
* @return a {@link PoolableCallableStatement}
423+
* @return A {@link PoolableCallableStatement}
424424
* @throws SQLException
425425
* Wraps an underlying exception.
426426
*/
@@ -438,7 +438,7 @@ public CallableStatement prepareCall(final String sql) throws SQLException {
438438
* result set type
439439
* @param resultSetConcurrency
440440
* result set concurrency
441-
* @return a {@link PoolableCallableStatement}
441+
* @return A {@link PoolableCallableStatement}
442442
* @throws SQLException
443443
* Wraps an underlying exception.
444444
*/
@@ -459,7 +459,7 @@ public CallableStatement prepareCall(final String sql, final int resultSetType,
459459
* result set concurrency
460460
* @param resultSetHoldability
461461
* result set holdability
462-
* @return a {@link PoolableCallableStatement}
462+
* @return A {@link PoolableCallableStatement}
463463
* @throws SQLException
464464
* Wraps an underlying exception.
465465
*/
@@ -475,7 +475,7 @@ public CallableStatement prepareCall(final String sql, final int resultSetType,
475475
*
476476
* @param key
477477
* a {@link PStmtKey} for the given arguments
478-
* @return a {@link PoolablePreparedStatement}
478+
* @return A {@link PoolablePreparedStatement}
479479
* @throws SQLException
480480
* Wraps an underlying exception.
481481
*/
@@ -499,7 +499,7 @@ private PreparedStatement prepareStatement(final PStmtKey key) throws SQLExcepti
499499
*
500500
* @param sql
501501
* the SQL string used to define the PreparedStatement
502-
* @return a {@link PoolablePreparedStatement}
502+
* @return A {@link PoolablePreparedStatement}
503503
* @throws SQLException
504504
* Wraps an underlying exception.
505505
*/
@@ -516,7 +516,7 @@ public PreparedStatement prepareStatement(final String sql) throws SQLException
516516
* @param autoGeneratedKeys
517517
* A flag indicating whether auto-generated keys should be returned; one of
518518
* {@link Statement#RETURN_GENERATED_KEYS} or {@link Statement#NO_GENERATED_KEYS}.
519-
* @return a {@link PoolablePreparedStatement}
519+
* @return A {@link PoolablePreparedStatement}
520520
* @throws SQLException
521521
* Wraps an underlying exception.
522522
*/
@@ -534,7 +534,7 @@ public PreparedStatement prepareStatement(final String sql, final int autoGenera
534534
* result set type
535535
* @param resultSetConcurrency
536536
* result set concurrency
537-
* @return a {@link PoolablePreparedStatement}
537+
* @return A {@link PoolablePreparedStatement}
538538
* @throws SQLException
539539
* Wraps an underlying exception.
540540
*/
@@ -555,7 +555,7 @@ public PreparedStatement prepareStatement(final String sql, final int resultSetT
555555
* result set concurrency
556556
* @param resultSetHoldability
557557
* result set holdability
558-
* @return a {@link PoolablePreparedStatement}
558+
* @return A {@link PoolablePreparedStatement}
559559
* @throws SQLException
560560
* Wraps an underlying exception.
561561
*/
@@ -573,7 +573,7 @@ public PreparedStatement prepareStatement(final String sql, final int resultSetT
573573
* @param columnIndexes
574574
* An array of column indexes indicating the columns that should be returned from the inserted row or
575575
* rows.
576-
* @return a {@link PoolablePreparedStatement}
576+
* @return A {@link PoolablePreparedStatement}
577577
* @throws SQLException
578578
* Wraps an underlying exception.
579579
*/
@@ -589,7 +589,7 @@ public PreparedStatement prepareStatement(final String sql, final int[] columnIn
589589
* the SQL string used to define the PreparedStatement
590590
* @param columnNames
591591
* column names
592-
* @return a {@link PoolablePreparedStatement}
592+
* @return A {@link PoolablePreparedStatement}
593593
* @throws SQLException
594594
* Wraps an underlying exception.
595595
*/

src/main/java/org/apache/commons/dbcp2/Utils.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ static void checkSqlCodes(final Collection<String> codes1, final Collection<Stri
108108
* Clones the given char[] if not null.
109109
*
110110
* @param value may be null.
111-
* @return a cloned char[] or null.
111+
* @return A cloned char[] or null.
112112
*/
113113
public static char[] clone(final char[] value) {
114114
return value == null ? null : value.clone();
@@ -118,7 +118,7 @@ public static char[] clone(final char[] value) {
118118
* Clones the given {@link Properties} without the standard "user" or "password" entries.
119119
*
120120
* @param properties may be null
121-
* @return a clone of the input without the standard "user" or "password" entries.
121+
* @return A clone of the input without the standard "user" or "password" entries.
122122
* @since 2.8.0
123123
*/
124124
public static Properties cloneWithoutCredentials(final Properties properties) {
@@ -260,7 +260,7 @@ static boolean isSecurityEnabled() {
260260
* Converts the given String to a char[].
261261
*
262262
* @param value may be null.
263-
* @return a char[] or null.
263+
* @return A char[] or null.
264264
*/
265265
public static char[] toCharArray(final String value) {
266266
return value != null ? value.toCharArray() : null;
@@ -270,7 +270,7 @@ public static char[] toCharArray(final String value) {
270270
* Converts the given char[] to a String.
271271
*
272272
* @param value may be null.
273-
* @return a String or null.
273+
* @return A String or null.
274274
*/
275275
public static String toString(final char[] value) {
276276
return value == null ? null : String.valueOf(value);

src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public boolean isAccessToUnderlyingConnectionAllowed() {
138138
* @param sql
139139
* an SQL statement that may contain one or more '?' parameter placeholders. Typically, this statement is
140140
* specified using JDBC call escape syntax.
141-
* @return a default {@link CallableStatement} object containing the pre-compiled SQL statement.
141+
* @return A default {@link CallableStatement} object containing the pre-compiled SQL statement.
142142
* @throws SQLException
143143
* Thrown if a database access error occurs or this method is called on a closed connection.
144144
* @since 2.4.0
@@ -167,7 +167,7 @@ public CallableStatement prepareCall(final String sql) throws SQLException {
167167
* @param resultSetConcurrency
168168
* a concurrency type; one of {@link ResultSet#CONCUR_READ_ONLY} or
169169
* {@link ResultSet#CONCUR_UPDATABLE}.
170-
* @return a {@link CallableStatement} object containing the pre-compiled SQL statement that will produce
170+
* @return A {@link CallableStatement} object containing the pre-compiled SQL statement that will produce
171171
* {@link ResultSet} objects with the given type and concurrency.
172172
* @throws SQLException
173173
* Thrown if a database access error occurs, this method is called on a closed connection or the given
@@ -203,7 +203,7 @@ public CallableStatement prepareCall(final String sql, final int resultSetType,
203203
* @param resultSetHoldability
204204
* one of the following {@link ResultSet} constants: {@link ResultSet#HOLD_CURSORS_OVER_COMMIT}
205205
* or {@link ResultSet#CLOSE_CURSORS_AT_COMMIT}.
206-
* @return a new {@link CallableStatement} object, containing the pre-compiled SQL statement, that will
206+
* @return A new {@link CallableStatement} object, containing the pre-compiled SQL statement, that will
207207
* generate {@link ResultSet} objects with the given type, concurrency, and holdability.
208208
* @throws SQLException
209209
* Thrown if a database access error occurs, this method is called on a closed connection or the given

0 commit comments

Comments
 (0)