diff --git a/jdk/src/share/classes/java/sql/Array.java b/jdk/src/share/classes/java/sql/Array.java index 9e2c210353e..fdc243663ce 100644 --- a/jdk/src/share/classes/java/sql/Array.java +++ b/jdk/src/share/classes/java/sql/Array.java @@ -348,12 +348,11 @@ public interface Array { * This method frees the Array object and releases the resources that * it holds. The object is invalid once the free * method is called. - *

+ *

* After free has been called, any attempt to invoke a * method other than free will result in a SQLException * being thrown. If free is called multiple times, the subsequent * calls to free are treated as a no-op. - *

* * @throws SQLException if an error occurs releasing * the Array's resources diff --git a/jdk/src/share/classes/java/sql/BatchUpdateException.java b/jdk/src/share/classes/java/sql/BatchUpdateException.java index 9c0c072140c..fd5fb2242a9 100644 --- a/jdk/src/share/classes/java/sql/BatchUpdateException.java +++ b/jdk/src/share/classes/java/sql/BatchUpdateException.java @@ -203,7 +203,6 @@ public class BatchUpdateException extends SQLException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

* * @since 1.2 * @see #BatchUpdateException(java.lang.String, java.lang.String, int, long[], @@ -378,7 +377,7 @@ public class BatchUpdateException extends SQLException { * there are commands in the batch; otherwise, it will contain an * update count for each command that executed successfully before * the BatchUpdateException was thrown. - *

+ *

* The possible return values for this method were modified for * the Java 2 SDK, Standard Edition, version 1.3. This was done to * accommodate the new option of continuing to process commands @@ -410,7 +409,7 @@ public class BatchUpdateException extends SQLException { *

* This constructor should be used when the returned update count may exceed * {@link Integer#MAX_VALUE}. - *

+ * * @param reason a description of the error * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param vendorCode an exception code used by a particular @@ -448,7 +447,7 @@ public class BatchUpdateException extends SQLException { *

* This method should be used when {@code Statement.executeLargeBatch} is * invoked and the returned update count may exceed {@link Integer#MAX_VALUE}. - *

+ * * @return an array of long containing the update counts * for the updates that were executed successfully before this error * occurred. Or, if the driver continues to process commands after an diff --git a/jdk/src/share/classes/java/sql/Blob.java b/jdk/src/share/classes/java/sql/Blob.java index ba65c4027d6..090e89b6750 100644 --- a/jdk/src/share/classes/java/sql/Blob.java +++ b/jdk/src/share/classes/java/sql/Blob.java @@ -269,12 +269,11 @@ public interface Blob { * This method frees the Blob object and releases the resources that * it holds. The object is invalid once the free * method is called. - *

+ *

* After free has been called, any attempt to invoke a * method other than free will result in a SQLException * being thrown. If free is called multiple times, the subsequent * calls to free are treated as a no-op. - *

* * @throws SQLException if an error occurs releasing * the Blob's resources diff --git a/jdk/src/share/classes/java/sql/CallableStatement.java b/jdk/src/share/classes/java/sql/CallableStatement.java index a830b63ea8b..20da9aae6a9 100644 --- a/jdk/src/share/classes/java/sql/CallableStatement.java +++ b/jdk/src/share/classes/java/sql/CallableStatement.java @@ -1160,13 +1160,13 @@ public interface CallableStatement extends PreparedStatement { *

* This method throws an exception if there is an ambiguity, for example, if the * object is of a class implementing more than one of the interfaces named above. - *

+ *

*Note: Not all databases allow for a non-typed Null to be sent to * the backend. For maximum portability, the setNull or the * setObject(String parameterName, Object x, int sqlType) * method should be used * instead of setObject(String parameterName, Object x). - *

+ * * @param parameterName the name of the parameter * @param x the object containing the input parameter value * @exception SQLException if parameterName does not correspond to a named @@ -2025,7 +2025,7 @@ public interface CallableStatement extends PreparedStatement { * NVARCHAR * or LONGNVARCHAR parameter as * a String in the Java programming language. - *

+ *

* For the fixed-length type JDBC NCHAR, * the String object * returned has exactly the same value the SQL diff --git a/jdk/src/share/classes/java/sql/Clob.java b/jdk/src/share/classes/java/sql/Clob.java index 2cfd4e47018..b074ac604c0 100644 --- a/jdk/src/share/classes/java/sql/Clob.java +++ b/jdk/src/share/classes/java/sql/Clob.java @@ -317,7 +317,7 @@ public interface Clob { * method other than free will result in a SQLException * being thrown. If free is called multiple times, the subsequent * calls to free are treated as a no-op. - *

+ * * @throws SQLException if an error occurs releasing * the Clob's resources * diff --git a/jdk/src/share/classes/java/sql/Connection.java b/jdk/src/share/classes/java/sql/Connection.java index 4cedd13dc3b..ea191cd2dba 100644 --- a/jdk/src/share/classes/java/sql/Connection.java +++ b/jdk/src/share/classes/java/sql/Connection.java @@ -273,7 +273,6 @@ public interface Connection extends Wrapper, AutoCloseable { * commits or rolls back an active transaction prior to calling the * close method. If the close method is called * and there is an active transaction, the results are implementation-defined. - *

* * @exception SQLException SQLException if a database access error occurs */ @@ -632,7 +631,7 @@ public interface Connection extends Wrapper, AutoCloseable { * Installs the given TypeMap object as the type map for * this Connection object. The type map will be used for the * custom mapping of SQL structured types and distinct types. - *

+ *

* You must set the the values for the TypeMap prior to * callng setMap as a JDBC driver may create an internal copy * of the TypeMap: @@ -1114,7 +1113,7 @@ public interface Connection extends Wrapper, AutoCloseable { * completes, this method returns false. A value of * 0 indicates a timeout is not applied to the * database operation. - *

+ * * @return true if the connection is valid, false otherwise * @exception SQLException if the value supplied for timeout * is less then 0 @@ -1165,16 +1164,16 @@ public interface Connection extends Wrapper, AutoCloseable { *

  • ClientHostname - The hostname of the computer the application * using the connection is running on.
    • * - *

    + * * @param name The name of the client info property to set * @param value The value to set the client info property to. If the * value is null, the current value of the specified * property is cleared. - *

    + * * @throws SQLClientInfoException if the database server returns an error while * setting the client info value on the database server or this method * is called on a closed connection - *

    + * * @since 1.6 */ void setClientInfo(String name, String value) @@ -1198,13 +1197,13 @@ public interface Connection extends Wrapper, AutoCloseable { * some databases do not allow multiple client info properties to be set * atomically. For those databases, one or more properties may have been * set before the error occurred. - *

    + * * * @param properties the list of client info properties to set - *

    + * * @see java.sql.Connection#setClientInfo(String, String) setClientInfo(String, String) * @since 1.6 - *

    + * * @throws SQLClientInfoException if the database server returns an error while * setting the clientInfo values on the database server or this method * is called on a closed connection @@ -1222,15 +1221,15 @@ public interface Connection extends Wrapper, AutoCloseable { *

    * Applications may use the DatabaseMetaData.getClientInfoProperties * method to determine the client info properties supported by the driver. - *

    + * * @param name The name of the client info property to retrieve - *

    + * * @return The value of the client info property specified - *

    + * * @throws SQLException if the database server returns an error when - * fetching the client info value from the database - *or this method is called on a closed connection - *

    + * fetching the client info value from the database + * or this method is called on a closed connection + * * @since 1.6 * * @see java.sql.DatabaseMetaData#getClientInfoProperties @@ -1243,14 +1242,14 @@ public interface Connection extends Wrapper, AutoCloseable { * property supported by the driver. The value of a client info property * may be null if the property has not been set and does not have a * default value. - *

    + * * @return A Properties object that contains the name and current value of * each of the client info properties supported by the driver. - *

    + * * @throws SQLException if the database server returns an error when * fetching the client info values from the database * or this method is called on a closed connection - *

    + * * @since 1.6 */ Properties getClientInfo() @@ -1294,7 +1293,7 @@ SQLException; * Struct.getSQLTypeName. * @param attributes the attributes that populate the returned object - * @return a Struct object that maps to the given SQL type and is populated with the given attributes + * @return a Struct object that maps to the given SQL type and is populated with the given attributes * @throws SQLException if a database error occurs, the typeName is null or this method is called on a closed connection * @throws SQLFeatureNotSupportedException if the JDBC driver does not support this data type * @since 1.6 @@ -1426,7 +1425,7 @@ throws SQLException; * problems, the connection will be marked as closed, any resources held by * the connection will be released and both the connection and * statement will be unusable. - *

    + *

    * When the driver determines that the {@code setNetworkTimeout} timeout * value has expired, the JDBC driver marks the connection * closed and releases any resources held by the connection. diff --git a/jdk/src/share/classes/java/sql/DataTruncation.java b/jdk/src/share/classes/java/sql/DataTruncation.java index 3a00c439f9f..5aef67c2af1 100644 --- a/jdk/src/share/classes/java/sql/DataTruncation.java +++ b/jdk/src/share/classes/java/sql/DataTruncation.java @@ -49,7 +49,6 @@ public class DataTruncation extends SQLWarning { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    * * @param index The index of the parameter or column value * @param parameter true if a parameter value was truncated @@ -77,7 +76,6 @@ public class DataTruncation extends SQLWarning { * the reason set to "Data truncation", the * vendor code set to 0, and * the other fields set to the given values. - *

    * * @param index The index of the parameter or column value * @param parameter true if a parameter value was truncated diff --git a/jdk/src/share/classes/java/sql/DatabaseMetaData.java b/jdk/src/share/classes/java/sql/DatabaseMetaData.java index 11b013df863..07b7475c4b3 100644 --- a/jdk/src/share/classes/java/sql/DatabaseMetaData.java +++ b/jdk/src/share/classes/java/sql/DatabaseMetaData.java @@ -1417,7 +1417,7 @@ public interface DatabaseMetaData extends Wrapper { * A possible value for the column * COLUMN_TYPE * in the ResultSet - * returned by the method getProcedureColumns. + * returned by the method getProcedureColumns. */ int procedureColumnOut = 4; /** @@ -2367,7 +2367,6 @@ public interface DatabaseMetaData extends Wrapper { *

    If SQL distinct or structured types are supported, then information on the * individual types may be obtained from the getUDTs() method. * - * *

    Each type description has the following columns: *

      @@ -2377,7 +2376,7 @@ public interface DatabaseMetaData extends Wrapper { *
    1. LITERAL_PREFIX String {@code =>} prefix used to quote a literal * (may be null) *
    2. LITERAL_SUFFIX String {@code =>} suffix used to quote a literal - (may be null) + * (may be null) *
    3. CREATE_PARAMS String {@code =>} parameters used in creating * the type (may be null) *
    4. NULLABLE short {@code =>} can you use NULL for this type. @@ -2821,7 +2820,7 @@ public interface DatabaseMetaData extends Wrapper { /** * Retrieves the connection that produced this metadata object. - *

      + * * @return the connection that produced this metadata object * @exception SQLException if a database access error occurs * @since 1.2 @@ -2870,9 +2869,9 @@ public interface DatabaseMetaData extends Wrapper { * * @return true if auto-generated keys can be retrieved * after a statement has executed; false otherwise - *

      If true is returned, the JDBC driver must support the + *

      If true is returned, the JDBC driver must support the * returning of auto-generated keys for at least SQL INSERT statements - *

      + * * @exception SQLException if a database access error occurs * @since 1.4 */ @@ -3138,7 +3137,7 @@ public interface DatabaseMetaData extends Wrapper { * whether the value returned by the method * SQLException.getSQLState is an * X/Open (now know as Open Group) SQL CLI SQLSTATE value. - *

      + * * @since 1.4 */ int sqlStateXOpen = 1; @@ -3148,7 +3147,7 @@ public interface DatabaseMetaData extends Wrapper { * DatabaseMetaData.getSQLStateType which is used to indicate * whether the value returned by the method * SQLException.getSQLState is an SQLSTATE value. - *

      + * * @since 1.6 */ int sqlStateSQL = 2; @@ -3282,12 +3281,12 @@ public interface DatabaseMetaData extends Wrapper { *

    *

    * The ResultSet is sorted by the NAME column - *

    + * * @return A ResultSet object; each row is a supported client info * property - *

    + * * @exception SQLException if a database access error occurs - *

    + * * @since 1.6 */ ResultSet getClientInfoProperties() diff --git a/jdk/src/share/classes/java/sql/Date.java b/jdk/src/share/classes/java/sql/Date.java index 9ac1e1c6f74..ab5121fca21 100644 --- a/jdk/src/share/classes/java/sql/Date.java +++ b/jdk/src/share/classes/java/sql/Date.java @@ -150,7 +150,7 @@ public class Date extends java.util.Date { /** * Formats a date in the date escape format yyyy-mm-dd. - *

    + * * @return a String in yyyy-mm-dd format */ @SuppressWarnings("deprecation") diff --git a/jdk/src/share/classes/java/sql/JDBCType.java b/jdk/src/share/classes/java/sql/JDBCType.java index 89db37bbf59..1ca4b3d0286 100644 --- a/jdk/src/share/classes/java/sql/JDBCType.java +++ b/jdk/src/share/classes/java/sql/JDBCType.java @@ -27,7 +27,7 @@ package java.sql; /** *

    Defines the constants that are used to identify generic * SQL types, called JDBC types. - *

    + * * @see SQLType * @since 1.8 */ diff --git a/jdk/src/share/classes/java/sql/PreparedStatement.java b/jdk/src/share/classes/java/sql/PreparedStatement.java index 2b2e7f3374b..f33fd10aae9 100644 --- a/jdk/src/share/classes/java/sql/PreparedStatement.java +++ b/jdk/src/share/classes/java/sql/PreparedStatement.java @@ -892,7 +892,6 @@ public interface PreparedStatement extends Statement { * Sets the designated parameter to the given java.sql.SQLXML object. * The driver converts this to an * SQL XML value when it sends it to the database. - *

    * * @param parameterIndex index of the first parameter is 1, the second is 2, ... * @param xmlObject a SQLXML object that maps an SQL XML value diff --git a/jdk/src/share/classes/java/sql/ResultSet.java b/jdk/src/share/classes/java/sql/ResultSet.java index d939a9a582e..656fa535528 100644 --- a/jdk/src/share/classes/java/sql/ResultSet.java +++ b/jdk/src/share/classes/java/sql/ResultSet.java @@ -1259,7 +1259,6 @@ public interface ResultSet extends Wrapper, AutoCloseable { * If an input stream is open for the current row, a call to the method * previous will implicitly close it. A ResultSet * object's warning change is cleared when a new row is read. - *

    * * @return true if the cursor is now positioned on a valid row; * false if the cursor is positioned before the first row @@ -3206,7 +3205,6 @@ public interface ResultSet extends Wrapper, AutoCloseable { * row. The updater methods do not update the underlying database; instead * the updateRow or insertRow methods are called * to update the database. - *

    * * @param columnIndex the first column is 1, the second 2, ... * @param xmlObject the value for the column to be updated @@ -3232,7 +3230,6 @@ public interface ResultSet extends Wrapper, AutoCloseable { * row. The updater methods do not update the underlying database; instead * the updateRow or insertRow methods are called * to update the database. - *

    * * @param columnLabel the label for the column specified with the SQL AS clause. If the SQL AS clause was not specified, then the label is the name of the column * @param xmlObject the column value diff --git a/jdk/src/share/classes/java/sql/SQLClientInfoException.java b/jdk/src/share/classes/java/sql/SQLClientInfoException.java index 131e407824f..8c8e8c867ff 100644 --- a/jdk/src/share/classes/java/sql/SQLClientInfoException.java +++ b/jdk/src/share/classes/java/sql/SQLClientInfoException.java @@ -40,7 +40,7 @@ import java.util.Map; * properties are identified by passing a * Map<String,ClientInfoStatus> to * the appropriate SQLClientInfoException constructor. - *

    + * * @see ClientInfoStatus * @see Connection#setClientInfo * @since 1.6 @@ -60,7 +60,6 @@ public class SQLClientInfoException extends SQLException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    * * @since 1.6 */ @@ -78,7 +77,6 @@ public class SQLClientInfoException extends SQLException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    * * @param failedProperties A Map containing the property values that could not * be set. The keys in the Map @@ -86,7 +84,7 @@ public class SQLClientInfoException extends SQLException { * properties that could not be set and * the values contain one of the reason codes * defined in ClientInfoStatus - *

    + * * @since 1.6 */ public SQLClientInfoException(Map failedProperties) { @@ -102,8 +100,6 @@ public class SQLClientInfoException extends SQLException { * cause==null or to cause.toString() if * cause!=null and the vendor code is initialized to 0. * - *

    - * * @param failedProperties A Map containing the property values that could not * be set. The keys in the Map * contain the names of the client info @@ -112,7 +108,7 @@ public class SQLClientInfoException extends SQLException { * defined in ClientInfoStatus * @param cause the (which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. - *

    + * * @since 1.6 */ public SQLClientInfoException(Map failedProperties, @@ -132,7 +128,6 @@ public class SQLClientInfoException extends SQLException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    * * @param reason a description of the exception * @param failedProperties A Map containing the property values that could not @@ -141,7 +136,7 @@ public class SQLClientInfoException extends SQLException { * properties that could not be set and * the values contain one of the reason codes * defined in ClientInfoStatus - *

    + * * @since 1.6 */ public SQLClientInfoException(String reason, @@ -157,7 +152,6 @@ public class SQLClientInfoException extends SQLException { * failedProperties. * The SQLState is initialized * to null and the vendor code is initialized to 0. - *

    * * @param reason a description of the exception * @param failedProperties A Map containing the property values that could not @@ -168,7 +162,7 @@ public class SQLClientInfoException extends SQLException { * defined in ClientInfoStatus * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. - *

    + * * @since 1.6 */ public SQLClientInfoException(String reason, @@ -188,17 +182,16 @@ public class SQLClientInfoException extends SQLException { * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code * is initialized to 0. - *

    * - * @param reason a description of the exception - * @param SQLState an XOPEN or SQL:2003 code identifying the exception + * @param reason a description of the exception + * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param failedProperties A Map containing the property values that could not * be set. The keys in the Map * contain the names of the client info * properties that could not be set and * the values contain one of the reason codes * defined in ClientInfoStatus - *

    + * * @since 1.6 */ public SQLClientInfoException(String reason, @@ -213,19 +206,18 @@ public class SQLClientInfoException extends SQLException { * Constructs a SQLClientInfoException object initialized with a * given reason, SQLState, cause * and failedProperties. The vendor code is initialized to 0. - *

    * - * @param reason a description of the exception - * @param SQLState an XOPEN or SQL:2003 code identifying the exception + * @param reason a description of the exception + * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param failedProperties A Map containing the property values that could not * be set. The keys in the Map * contain the names of the client info * properties that could not be set and * the values contain one of the reason codes * defined in ClientInfoStatus - * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating + * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. - *

    + * * @since 1.6 */ public SQLClientInfoException(String reason, @@ -245,18 +237,17 @@ public class SQLClientInfoException extends SQLException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    * - * @param reason a description of the exception - * @param SQLState an XOPEN or SQL:2003 code identifying the exception - * @param vendorCode a database vendor-specific exception code + * @param reason a description of the exception + * @param SQLState an XOPEN or SQL:2003 code identifying the exception + * @param vendorCode a database vendor-specific exception code * @param failedProperties A Map containing the property values that could not * be set. The keys in the Map * contain the names of the client info * properties that could not be set and * the values contain one of the reason codes * defined in ClientInfoStatus - *

    + * * @since 1.6 */ public SQLClientInfoException(String reason, @@ -273,11 +264,10 @@ public class SQLClientInfoException extends SQLException { * given reason, SQLState, * cause, vendorCode and * failedProperties. - *

    * - * @param reason a description of the exception - * @param SQLState an XOPEN or SQL:2003 code identifying the exception - * @param vendorCode a database vendor-specific exception code + * @param reason a description of the exception + * @param SQLState an XOPEN or SQL:2003 code identifying the exception + * @param vendorCode a database vendor-specific exception code * @param failedProperties A Map containing the property values that could not * be set. The keys in the Map * contain the names of the client info @@ -285,8 +275,8 @@ public class SQLClientInfoException extends SQLException { * the values contain one of the reason codes * defined in ClientInfoStatus * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating - * the cause is non-existent or unknown. - *

    + * the cause is non-existent or unknown. + * * @since 1.6 */ public SQLClientInfoException(String reason, @@ -305,11 +295,10 @@ public class SQLClientInfoException extends SQLException { * keys in the Map contain the names of the client info * properties that could not be set and the values contain one of the * reason codes defined in ClientInfoStatus - *

    * * @return Map list containing the client info properties that could * not be set - *

    + * * @since 1.6 */ public Map getFailedProperties() { diff --git a/jdk/src/share/classes/java/sql/SQLDataException.java b/jdk/src/share/classes/java/sql/SQLDataException.java index 8dc1753a6b7..5d193b410e0 100644 --- a/jdk/src/share/classes/java/sql/SQLDataException.java +++ b/jdk/src/share/classes/java/sql/SQLDataException.java @@ -45,7 +45,6 @@ public class SQLDataException extends SQLNonTransientException { * The cause is not initialized, and may subsequently be * initialized by a call to * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    * * @since 1.6 */ @@ -62,7 +61,6 @@ public class SQLDataException extends SQLNonTransientException { * The cause is not initialized, and may subsequently be * initialized by a call to * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    * * @param reason a description of the exception * @since 1.6 @@ -79,7 +77,7 @@ public class SQLDataException extends SQLNonTransientException { * The cause is not initialized, and may subsequently be * initialized by a call to * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @since 1.6 @@ -96,7 +94,7 @@ public class SQLDataException extends SQLNonTransientException { * The cause is not initialized, and may subsequently be * initialized by a call to * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param vendorCode a database vendor specific exception code @@ -114,7 +112,7 @@ public class SQLDataException extends SQLNonTransientException { * The reason is initialized to null if * cause==null or to cause.toString() if * cause!=null. - *

    + * * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. * @since 1.6 @@ -128,7 +126,7 @@ public class SQLDataException extends SQLNonTransientException { * reason and cause. * The SQLState is initialized to null * and the vendor code is initialized to 0. - *

    + * * @param reason a description of the exception. * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. @@ -142,7 +140,7 @@ public class SQLDataException extends SQLNonTransientException { * Constructs a SQLDataException object with a given * reason, SQLState and cause. * The vendor code is initialized to 0. - *

    + * * @param reason a description of the exception. * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating @@ -157,7 +155,7 @@ public class SQLDataException extends SQLNonTransientException { * Constructs a SQLDataException object with a given * reason, SQLState, vendorCode * and cause. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param vendorCode a database vendor-specific exception code diff --git a/jdk/src/share/classes/java/sql/SQLException.java b/jdk/src/share/classes/java/sql/SQLException.java index d6c9bd2e05c..0076679fdb1 100644 --- a/jdk/src/share/classes/java/sql/SQLException.java +++ b/jdk/src/share/classes/java/sql/SQLException.java @@ -61,7 +61,7 @@ public class SQLException extends java.lang.Exception * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param vendorCode a database vendor-specific exception code @@ -88,7 +88,7 @@ public class SQLException extends java.lang.Exception * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code * is initialized to 0. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception */ @@ -112,7 +112,7 @@ public class SQLException extends java.lang.Exception * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @param reason a description of the exception */ public SQLException(String reason) { @@ -155,7 +155,7 @@ public class SQLException extends java.lang.Exception * The reason is initialized to null if * cause==null or to cause.toString() if * cause!=null. - *

    + * * @param cause the underlying reason for this SQLException * (which is saved for later retrieval by the getCause() method); * may be null indicating the cause is non-existent or unknown. @@ -176,7 +176,7 @@ public class SQLException extends java.lang.Exception * reason and cause. * The SQLState is initialized to null * and the vendor code is initialized to 0. - *

    + * * @param reason a description of the exception. * @param cause the underlying reason for this SQLException * (which is saved for later retrieval by the getCause() method); @@ -197,7 +197,7 @@ public class SQLException extends java.lang.Exception * Constructs a SQLException object with a given * reason, SQLState and cause. * The vendor code is initialized to 0. - *

    + * * @param reason a description of the exception. * @param sqlState an XOPEN or SQL:2003 code identifying the exception * @param cause the underlying reason for this SQLException @@ -223,7 +223,7 @@ public class SQLException extends java.lang.Exception * Constructs a SQLException object with a given * reason, SQLState, vendorCode * and cause. - *

    + * * @param reason a description of the exception * @param sqlState an XOPEN or SQL:2003 code identifying the exception * @param vendorCode a database vendor-specific exception code diff --git a/jdk/src/share/classes/java/sql/SQLFeatureNotSupportedException.java b/jdk/src/share/classes/java/sql/SQLFeatureNotSupportedException.java index 98900fb4d26..88d82aa8cca 100644 --- a/jdk/src/share/classes/java/sql/SQLFeatureNotSupportedException.java +++ b/jdk/src/share/classes/java/sql/SQLFeatureNotSupportedException.java @@ -50,7 +50,7 @@ public class SQLFeatureNotSupportedException extends SQLNonTransientException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @since 1.6 */ public SQLFeatureNotSupportedException() { @@ -66,7 +66,7 @@ public class SQLFeatureNotSupportedException extends SQLNonTransientException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @param reason a description of the exception * @since 1.6 */ @@ -82,7 +82,7 @@ public class SQLFeatureNotSupportedException extends SQLNonTransientException { * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code * is initialized to 0. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @since 1.6 @@ -99,7 +99,7 @@ public class SQLFeatureNotSupportedException extends SQLNonTransientException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param vendorCode a database vendor specific exception code @@ -117,7 +117,7 @@ public class SQLFeatureNotSupportedException extends SQLNonTransientException { * The reason is initialized to null if * cause==null or to cause.toString() if * cause!=null. - *

    + * * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. * @since 1.6 @@ -132,7 +132,7 @@ public class SQLFeatureNotSupportedException extends SQLNonTransientException { * reason and cause. * The SQLState is initialized to null * and the vendor code is initialized to 0. - *

    + * * @param reason a description of the exception. * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. @@ -147,7 +147,7 @@ public class SQLFeatureNotSupportedException extends SQLNonTransientException { * with a given * reason, SQLState and cause. * The vendor code is initialized to 0. - *

    + * * @param reason a description of the exception. * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param cause the (which is saved for later retrieval by the getCause() method); may be null indicating @@ -163,7 +163,7 @@ public class SQLFeatureNotSupportedException extends SQLNonTransientException { * with a given * reason, SQLState, vendorCode * and cause. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param vendorCode a database vendor-specific exception code diff --git a/jdk/src/share/classes/java/sql/SQLIntegrityConstraintViolationException.java b/jdk/src/share/classes/java/sql/SQLIntegrityConstraintViolationException.java index 86b4e8f91d3..3a6b1cc1f0f 100644 --- a/jdk/src/share/classes/java/sql/SQLIntegrityConstraintViolationException.java +++ b/jdk/src/share/classes/java/sql/SQLIntegrityConstraintViolationException.java @@ -45,7 +45,7 @@ public class SQLIntegrityConstraintViolationException extends SQLNonTransientExc * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @since 1.6 */ public SQLIntegrityConstraintViolationException() { @@ -61,7 +61,7 @@ public class SQLIntegrityConstraintViolationException extends SQLNonTransientExc * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @param reason a description of the exception * @since 1.6 */ @@ -77,7 +77,7 @@ public class SQLIntegrityConstraintViolationException extends SQLNonTransientExc * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code * is initialized to 0. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @since 1.6 @@ -94,7 +94,7 @@ public class SQLIntegrityConstraintViolationException extends SQLNonTransientExc * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param vendorCode a database vendor specific exception code @@ -112,11 +112,11 @@ public class SQLIntegrityConstraintViolationException extends SQLNonTransientExc * The reason is initialized to null if * cause==null or to cause.toString() if * cause!=null. - *

    + * * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. * @since 1.6 - */ + */ public SQLIntegrityConstraintViolationException(Throwable cause) { super(cause); } @@ -127,7 +127,7 @@ public class SQLIntegrityConstraintViolationException extends SQLNonTransientExc * reason and cause. * The SQLState is initialized to null * and the vendor code is initialized to 0. - *

    + * * @param reason a description of the exception. * @param cause the (which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. @@ -142,7 +142,7 @@ public class SQLIntegrityConstraintViolationException extends SQLNonTransientExc * with a given * reason, SQLState and cause. * The vendor code is initialized to 0. - *

    + * * @param reason a description of the exception. * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating @@ -158,7 +158,7 @@ public class SQLIntegrityConstraintViolationException extends SQLNonTransientExc * with a given * reason, SQLState, vendorCode * and cause. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param vendorCode a database vendor-specific exception code diff --git a/jdk/src/share/classes/java/sql/SQLInvalidAuthorizationSpecException.java b/jdk/src/share/classes/java/sql/SQLInvalidAuthorizationSpecException.java index 63009d98acb..97cdfba993c 100644 --- a/jdk/src/share/classes/java/sql/SQLInvalidAuthorizationSpecException.java +++ b/jdk/src/share/classes/java/sql/SQLInvalidAuthorizationSpecException.java @@ -45,7 +45,7 @@ public class SQLInvalidAuthorizationSpecException extends SQLNonTransientExcepti * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @since 1.6 */ public SQLInvalidAuthorizationSpecException() { @@ -61,7 +61,7 @@ public class SQLInvalidAuthorizationSpecException extends SQLNonTransientExcepti * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @param reason a description of the exception * @since 1.6 */ @@ -77,7 +77,7 @@ public class SQLInvalidAuthorizationSpecException extends SQLNonTransientExcepti * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code * is initialized to 0. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @since 1.6 @@ -94,7 +94,7 @@ public class SQLInvalidAuthorizationSpecException extends SQLNonTransientExcepti * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param vendorCode a database vendor specific exception code @@ -104,19 +104,19 @@ public class SQLInvalidAuthorizationSpecException extends SQLNonTransientExcepti super(reason,SQLState,vendorCode); } - /** + /** * Constructs a SQLInvalidAuthorizationSpecException object - * with a given cause. + * with a given cause. * The SQLState is initialized * to null and the vendor code is initialized to 0. * The reason is initialized to null if * cause==null or to cause.toString() if * cause!=null. - *

    + * * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. * @since 1.6 - */ + */ public SQLInvalidAuthorizationSpecException(Throwable cause) { super(cause); } @@ -127,7 +127,7 @@ public class SQLInvalidAuthorizationSpecException extends SQLNonTransientExcepti * reason and cause. * The SQLState is initialized to null * and the vendor code is initialized to 0. - *

    + * * @param reason a description of the exception. * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. @@ -142,7 +142,7 @@ public class SQLInvalidAuthorizationSpecException extends SQLNonTransientExcepti * with a given * reason, SQLState and cause. * The vendor code is initialized to 0. - *

    + * * @param reason a description of the exception. * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating @@ -158,7 +158,7 @@ public class SQLInvalidAuthorizationSpecException extends SQLNonTransientExcepti * with a given * reason, SQLState, vendorCode * and cause. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param vendorCode a database vendor-specific exception code diff --git a/jdk/src/share/classes/java/sql/SQLNonTransientConnectionException.java b/jdk/src/share/classes/java/sql/SQLNonTransientConnectionException.java index f28252af18d..a712cef50aa 100644 --- a/jdk/src/share/classes/java/sql/SQLNonTransientConnectionException.java +++ b/jdk/src/share/classes/java/sql/SQLNonTransientConnectionException.java @@ -45,7 +45,6 @@ public class SQLNonTransientConnectionException extends java.sql.SQLNonTransient * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    * * @since 1.6 */ @@ -62,7 +61,7 @@ public class SQLNonTransientConnectionException extends java.sql.SQLNonTransient * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @param reason a description of the exception * @since 1.6 */ @@ -78,7 +77,7 @@ public class SQLNonTransientConnectionException extends java.sql.SQLNonTransient * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code * is initialized to 0. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @since 1.6 @@ -95,7 +94,7 @@ public class SQLNonTransientConnectionException extends java.sql.SQLNonTransient * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param vendorCode a database vendor specific exception code @@ -105,15 +104,15 @@ public class SQLNonTransientConnectionException extends java.sql.SQLNonTransient super(reason,SQLState,vendorCode); } - /** + /** * Constructs a SQLNonTransientConnectionException object - * with a given cause. - * The SQLState is initialized + * with a given cause. + * The SQLState is initialized * to null and the vendor code is initialized to 0. * The reason is initialized to null if * cause==null or to cause.toString() if * cause!=null. - *

    + * * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. * @since 1.6 @@ -128,7 +127,7 @@ public class SQLNonTransientConnectionException extends java.sql.SQLNonTransient * reason and cause. * The SQLState is initialized to null * and the vendor code is initialized to 0. - *

    + * * @param reason a description of the exception. * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. @@ -143,7 +142,7 @@ public class SQLNonTransientConnectionException extends java.sql.SQLNonTransient * with a given * reason, SQLState and cause. * The vendor code is initialized to 0. - *

    + * * @param reason a description of the exception. * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param cause the (which is saved for later retrieval by the getCause() method); may be null indicating @@ -155,11 +154,11 @@ public class SQLNonTransientConnectionException extends java.sql.SQLNonTransient } /** - * Constructs a SQLNonTransientConnectionException object + * Constructs a SQLNonTransientConnectionException object * with a given * reason, SQLState, vendorCode * and cause. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param vendorCode a database vendor-specific exception code diff --git a/jdk/src/share/classes/java/sql/SQLNonTransientException.java b/jdk/src/share/classes/java/sql/SQLNonTransientException.java index 9d1a636ee49..db16e68b18e 100644 --- a/jdk/src/share/classes/java/sql/SQLNonTransientException.java +++ b/jdk/src/share/classes/java/sql/SQLNonTransientException.java @@ -29,7 +29,6 @@ package java.sql; * The subclass of {@link SQLException} thrown when an instance where a retry * of the same operation would fail unless the cause of the SQLException * is corrected. - *

    * * @since 1.6 */ @@ -43,7 +42,6 @@ public class SQLNonTransientException extends java.sql.SQLException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    * * @since 1.6 */ @@ -60,7 +58,6 @@ public class SQLNonTransientException extends java.sql.SQLException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    * * @param reason a description of the exception * @since 1.6 @@ -77,7 +74,7 @@ public class SQLNonTransientException extends java.sql.SQLException { * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code * is initialized to 0. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @since 1.6 @@ -94,7 +91,7 @@ public class SQLNonTransientException extends java.sql.SQLException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param vendorCode a database vendor specific exception code @@ -112,7 +109,7 @@ public class SQLNonTransientException extends java.sql.SQLException { * The reason is initialized to null if * cause==null or to cause.toString() if * cause!=null. - *

    + * * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. * @since 1.6 @@ -127,7 +124,7 @@ public class SQLNonTransientException extends java.sql.SQLException { * reason and cause. * The SQLState is initialized to null * and the vendor code is initialized to 0. - *

    + * * @param reason a description of the exception. * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. @@ -143,7 +140,7 @@ public class SQLNonTransientException extends java.sql.SQLException { * with a given * reason, SQLState and cause. * The vendor code is initialized to 0. - *

    + * * @param reason a description of the exception. * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating @@ -155,11 +152,11 @@ public class SQLNonTransientException extends java.sql.SQLException { } /** - * Constructs a SQLNonTransientException object + * Constructs a SQLNonTransientException object * with a given * reason, SQLState, vendorCode * and cause. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param vendorCode a database vendor-specific exception code diff --git a/jdk/src/share/classes/java/sql/SQLPermission.java b/jdk/src/share/classes/java/sql/SQLPermission.java index 951430d90cc..1224738a887 100644 --- a/jdk/src/share/classes/java/sql/SQLPermission.java +++ b/jdk/src/share/classes/java/sql/SQLPermission.java @@ -104,7 +104,7 @@ import java.security.*; * registered Drivers and release its resources. * * - *

    + * * @since 1.3 * @see java.security.BasicPermission * @see java.security.Permission diff --git a/jdk/src/share/classes/java/sql/SQLRecoverableException.java b/jdk/src/share/classes/java/sql/SQLRecoverableException.java index 76b32a412c1..5c21cb20b75 100644 --- a/jdk/src/share/classes/java/sql/SQLRecoverableException.java +++ b/jdk/src/share/classes/java/sql/SQLRecoverableException.java @@ -32,7 +32,6 @@ package java.sql; * distributed transaction, the transaction branch. At a minimum, * the recovery operation must include closing the current connection and getting * a new connection. - *

    * * @since 1.6 */ @@ -46,7 +45,7 @@ public class SQLRecoverableException extends java.sql.SQLException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @since 1.6 */ public SQLRecoverableException() { @@ -62,7 +61,7 @@ public class SQLRecoverableException extends java.sql.SQLException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @param reason a description of the exception * @since 1.6 */ @@ -78,7 +77,7 @@ public class SQLRecoverableException extends java.sql.SQLException { * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code * is initialized to 0. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @since 1.6 @@ -95,7 +94,7 @@ public class SQLRecoverableException extends java.sql.SQLException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param vendorCode a database vendor specific exception code @@ -113,7 +112,7 @@ public class SQLRecoverableException extends java.sql.SQLException { * The reason is initialized to null if * cause==null or to cause.toString() if * cause!=null. - *

    + * * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. * @since 1.6 @@ -128,7 +127,7 @@ public class SQLRecoverableException extends java.sql.SQLException { * reason and cause. * The SQLState is initialized to null * and the vendor code is initialized to 0. - *

    + * * @param reason a description of the exception. * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. @@ -143,7 +142,7 @@ public class SQLRecoverableException extends java.sql.SQLException { * with a given * reason, SQLState and cause. * The vendor code is initialized to 0. - *

    + * * @param reason a description of the exception. * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating @@ -159,7 +158,7 @@ public class SQLRecoverableException extends java.sql.SQLException { * with a given * reason, SQLState, vendorCode * and cause. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param vendorCode a database vendor-specific exception code diff --git a/jdk/src/share/classes/java/sql/SQLSyntaxErrorException.java b/jdk/src/share/classes/java/sql/SQLSyntaxErrorException.java index 2b3142fa6b5..bf7efc286f9 100644 --- a/jdk/src/share/classes/java/sql/SQLSyntaxErrorException.java +++ b/jdk/src/share/classes/java/sql/SQLSyntaxErrorException.java @@ -44,7 +44,7 @@ public class SQLSyntaxErrorException extends SQLNonTransientException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @since 1.6 */ public SQLSyntaxErrorException() { @@ -60,7 +60,7 @@ public class SQLSyntaxErrorException extends SQLNonTransientException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @param reason a description of the exception * @since 1.6 */ @@ -76,7 +76,7 @@ public class SQLSyntaxErrorException extends SQLNonTransientException { * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code * is initialized to 0. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @since 1.6 @@ -93,7 +93,7 @@ public class SQLSyntaxErrorException extends SQLNonTransientException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param vendorCode a database vendor specific exception code @@ -111,7 +111,7 @@ public class SQLSyntaxErrorException extends SQLNonTransientException { * The reason is initialized to null if * cause==null or to cause.toString() if * cause!=null. - *

    + * * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. * @since 1.6 @@ -126,7 +126,7 @@ public class SQLSyntaxErrorException extends SQLNonTransientException { * reason and cause. * The SQLState is initialized to null * and the vendor code is initialized to 0. - *

    + * * @param reason a description of the exception. * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. @@ -141,7 +141,7 @@ public class SQLSyntaxErrorException extends SQLNonTransientException { * with a given * reason, SQLState and cause. * The vendor code is initialized to 0. - *

    + * * @param reason a description of the exception. * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param cause the (which is saved for later retrieval by the getCause() method); may be null indicating @@ -157,7 +157,7 @@ public class SQLSyntaxErrorException extends SQLNonTransientException { * with a given * reason, SQLState, vendorCode * and cause. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param vendorCode a database vendor-specific exception code diff --git a/jdk/src/share/classes/java/sql/SQLTimeoutException.java b/jdk/src/share/classes/java/sql/SQLTimeoutException.java index 3f9ed357d30..2e0dfecac4d 100644 --- a/jdk/src/share/classes/java/sql/SQLTimeoutException.java +++ b/jdk/src/share/classes/java/sql/SQLTimeoutException.java @@ -44,7 +44,7 @@ public class SQLTimeoutException extends SQLTransientException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @since 1.6 */ public SQLTimeoutException() { @@ -60,7 +60,7 @@ public class SQLTimeoutException extends SQLTransientException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @param reason a description of the exception * @since 1.6 */ @@ -76,7 +76,7 @@ public class SQLTimeoutException extends SQLTransientException { * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code * is initialized to 0. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @since 1.6 @@ -93,7 +93,7 @@ public class SQLTimeoutException extends SQLTransientException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param vendorCode a database vendor specific exception code @@ -111,7 +111,7 @@ public class SQLTimeoutException extends SQLTransientException { * The reason is initialized to null if * cause==null or to cause.toString() if * cause!=null. - *

    + * * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. * @since 1.6 @@ -126,7 +126,7 @@ public class SQLTimeoutException extends SQLTransientException { * reason and cause. * The SQLState is initialized to null * and the vendor code is initialized to 0. - *

    + * * @param reason a description of the exception. * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. @@ -141,7 +141,7 @@ public class SQLTimeoutException extends SQLTransientException { * with a given * reason, SQLState and cause. * The vendor code is initialized to 0. - *

    + * * @param reason a description of the exception. * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating @@ -157,7 +157,7 @@ public class SQLTimeoutException extends SQLTransientException { * with a given * reason, SQLState, vendorCode * and cause. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param vendorCode a database vendor-specific exception code diff --git a/jdk/src/share/classes/java/sql/SQLTransactionRollbackException.java b/jdk/src/share/classes/java/sql/SQLTransactionRollbackException.java index 910f8b40827..2aa2fdba3f3 100644 --- a/jdk/src/share/classes/java/sql/SQLTransactionRollbackException.java +++ b/jdk/src/share/classes/java/sql/SQLTransactionRollbackException.java @@ -44,7 +44,7 @@ public class SQLTransactionRollbackException extends SQLTransientException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @since 1.6 */ public SQLTransactionRollbackException() { @@ -60,7 +60,7 @@ public class SQLTransactionRollbackException extends SQLTransientException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @param reason a description of the exception * @since 1.6 */ @@ -76,7 +76,7 @@ public class SQLTransactionRollbackException extends SQLTransientException { * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code * is initialized to 0. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @since 1.6 @@ -93,7 +93,7 @@ public class SQLTransactionRollbackException extends SQLTransientException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param vendorCode a database vendor specific exception code @@ -111,7 +111,7 @@ public class SQLTransactionRollbackException extends SQLTransientException { * The reason is initialized to null if * cause==null or to cause.toString() if * cause!=null. - *

    + * * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. * @since 1.6 @@ -126,7 +126,7 @@ public class SQLTransactionRollbackException extends SQLTransientException { * reason and cause. * The SQLState is initialized to null * and the vendor code is initialized to 0. - *

    + * * @param reason a description of the exception. * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. @@ -141,7 +141,7 @@ public class SQLTransactionRollbackException extends SQLTransientException { * with a given * reason, SQLState and cause. * The vendor code is initialized to 0. - *

    + * * @param reason a description of the exception. * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating @@ -157,7 +157,7 @@ public class SQLTransactionRollbackException extends SQLTransientException { * with a given * reason, SQLState, vendorCode * and cause. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param vendorCode a database vendor-specific exception code diff --git a/jdk/src/share/classes/java/sql/SQLTransientConnectionException.java b/jdk/src/share/classes/java/sql/SQLTransientConnectionException.java index e1c9bef15f4..d585bfbe98f 100644 --- a/jdk/src/share/classes/java/sql/SQLTransientConnectionException.java +++ b/jdk/src/share/classes/java/sql/SQLTransientConnectionException.java @@ -45,7 +45,7 @@ public class SQLTransientConnectionException extends java.sql.SQLTransientExcept * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @since 1.6 */ public SQLTransientConnectionException() { @@ -61,7 +61,7 @@ public class SQLTransientConnectionException extends java.sql.SQLTransientExcept * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @param reason a description of the exception * @since 1.6 */ @@ -77,7 +77,7 @@ public class SQLTransientConnectionException extends java.sql.SQLTransientExcept * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code * is initialized to 0. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @since 1.6 @@ -94,7 +94,7 @@ public class SQLTransientConnectionException extends java.sql.SQLTransientExcept * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param vendorCode a database vendor specific exception code @@ -112,7 +112,7 @@ public class SQLTransientConnectionException extends java.sql.SQLTransientExcept * The reason is initialized to null if * cause==null or to cause.toString() if * cause!=null. - *

    + * * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. * @since 1.6 @@ -127,7 +127,7 @@ public class SQLTransientConnectionException extends java.sql.SQLTransientExcept * reason and cause. * The SQLState is initialized to null * and the vendor code is initialized to 0. - *

    + * * @param reason a description of the exception. * @param cause the underlying reason for this SQLException(which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. @@ -142,7 +142,7 @@ public class SQLTransientConnectionException extends java.sql.SQLTransientExcept * with a given * reason, SQLState and cause. * The vendor code is initialized to 0. - *

    + * * @param reason a description of the exception. * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating @@ -158,7 +158,7 @@ public class SQLTransientConnectionException extends java.sql.SQLTransientExcept * with a given * reason, SQLState, vendorCode * and cause. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param vendorCode a database vendor-specific exception code diff --git a/jdk/src/share/classes/java/sql/SQLTransientException.java b/jdk/src/share/classes/java/sql/SQLTransientException.java index 4271df92623..df5a1ed23c7 100644 --- a/jdk/src/share/classes/java/sql/SQLTransientException.java +++ b/jdk/src/share/classes/java/sql/SQLTransientException.java @@ -29,7 +29,6 @@ package java.sql; * The subclass of {@link SQLException} is thrown in situations where a * previously failed operation might be able to succeed when the operation is * retried without any intervention by application-level functionality. - *

    * * @since 1.6 */ @@ -43,7 +42,7 @@ public class SQLTransientException extends java.sql.SQLException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @since 1.6 */ public SQLTransientException() { @@ -59,7 +58,7 @@ public class SQLTransientException extends java.sql.SQLException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @param reason a description of the exception * @since 1.6 */ @@ -75,7 +74,7 @@ public class SQLTransientException extends java.sql.SQLException { * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code * is initialized to 0. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @since 1.6 @@ -92,7 +91,7 @@ public class SQLTransientException extends java.sql.SQLException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param vendorCode a database vendor specific exception code @@ -110,7 +109,7 @@ public class SQLTransientException extends java.sql.SQLException { * The reason is initialized to null if * cause==null or to cause.toString() if * cause!=null. - *

    + * * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. * @since 1.6 @@ -125,7 +124,7 @@ public class SQLTransientException extends java.sql.SQLException { * reason and cause. * The SQLState is initialized to null * and the vendor code is initialized to 0. - *

    + * * @param reason a description of the exception. * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. @@ -140,7 +139,7 @@ public class SQLTransientException extends java.sql.SQLException { * with a given * reason, SQLState and cause. * The vendor code is initialized to 0. - *

    + * * @param reason a description of the exception. * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param cause the underlying reason for this SQLException (which is saved for later retrieval by the getCause() method); may be null indicating @@ -156,7 +155,7 @@ public class SQLTransientException extends java.sql.SQLException { * with a given * reason, SQLState, vendorCode * and cause. - *

    + * * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception * @param vendorCode a database vendor-specific exception code diff --git a/jdk/src/share/classes/java/sql/SQLWarning.java b/jdk/src/share/classes/java/sql/SQLWarning.java index 3dd334821fb..37d3bfc61a3 100644 --- a/jdk/src/share/classes/java/sql/SQLWarning.java +++ b/jdk/src/share/classes/java/sql/SQLWarning.java @@ -52,7 +52,7 @@ public class SQLWarning extends SQLException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @param reason a description of the warning * @param SQLState an XOPEN or SQL:2003 code identifying the warning * @param vendorCode a database vendor-specific warning code @@ -73,7 +73,7 @@ public class SQLWarning extends SQLException { * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code * is initialized to 0. - *

    + * * @param reason a description of the warning * @param SQLState an XOPEN or SQL:2003 code identifying the warning */ @@ -92,7 +92,7 @@ public class SQLWarning extends SQLException { * The cause is not initialized, and may subsequently be * initialized by a call to the * {@link Throwable#initCause(java.lang.Throwable)} method. - *

    + * * @param reason a description of the warning */ public SQLWarning(String reason) { @@ -123,7 +123,7 @@ public class SQLWarning extends SQLException { * The reason is initialized to null if * cause==null or to cause.toString() if * cause!=null. - *

    + * * @param cause the underlying reason for this SQLWarning (which is saved for later retrieval by the getCause() method); may be null indicating * the cause is non-existent or unknown. */ @@ -138,7 +138,7 @@ public class SQLWarning extends SQLException { * reason and cause. * The SQLState is initialized to null * and the vendor code is initialized to 0. - *

    + * * @param reason a description of the warning * @param cause the underlying reason for this SQLWarning * (which is saved for later retrieval by the getCause() method); @@ -154,7 +154,7 @@ public class SQLWarning extends SQLException { * with a given * reason, SQLState and cause. * The vendor code is initialized to 0. - *

    + * * @param reason a description of the warning * @param SQLState an XOPEN or SQL:2003 code identifying the warning * @param cause the underlying reason for this SQLWarning (which is saved for later retrieval by the getCause() method); may be null indicating @@ -171,7 +171,7 @@ public class SQLWarning extends SQLException { * with a given * reason, SQLState, vendorCode * and cause. - *

    + * * @param reason a description of the warning * @param SQLState an XOPEN or SQL:2003 code identifying the warning * @param vendorCode a database vendor-specific warning code diff --git a/jdk/src/share/classes/java/sql/Statement.java b/jdk/src/share/classes/java/sql/Statement.java index 7c8cff8185d..cf60bffc4f4 100644 --- a/jdk/src/share/classes/java/sql/Statement.java +++ b/jdk/src/share/classes/java/sql/Statement.java @@ -522,7 +522,7 @@ public interface Statement extends Wrapper, AutoCloseable { /** * Empties this Statement object's current list of * SQL commands. - *

    + * * @exception SQLException if a database access error occurs, * this method is called on a closed Statement or the * driver does not support batch updates @@ -1009,13 +1009,13 @@ public interface Statement extends Wrapper, AutoCloseable { * By default, a Statement is not poolable when created, and * a PreparedStatement and CallableStatement * are poolable when created. - *

    + * * @param poolable requests that the statement be pooled if true and * that the statement not be pooled if false - *

    + * * @throws SQLException if this method is called on a closed * Statement - *

    + * * @since 1.6 */ void setPoolable(boolean poolable) @@ -1024,15 +1024,15 @@ public interface Statement extends Wrapper, AutoCloseable { /** * Returns a value indicating whether the Statement * is poolable or not. - *

    + * * @return true if the Statement * is poolable; false otherwise - *

    + * * @throws SQLException if this method is called on a closed * Statement - *

    + * * @since 1.6 - *

    + * * @see java.sql.Statement#setPoolable(boolean) setPoolable(boolean) */ boolean isPoolable() diff --git a/jdk/src/share/classes/java/sql/Timestamp.java b/jdk/src/share/classes/java/sql/Timestamp.java index f4a527ab958..71c5a3e80a5 100644 --- a/jdk/src/share/classes/java/sql/Timestamp.java +++ b/jdk/src/share/classes/java/sql/Timestamp.java @@ -269,7 +269,7 @@ public class Timestamp extends java.util.Date { * Formats a timestamp in JDBC timestamp escape format. * yyyy-mm-dd hh:mm:ss.fffffffff, * where ffffffffff indicates nanoseconds. - *

    + * * @return a String object in * yyyy-mm-dd hh:mm:ss.fffffffff format */ diff --git a/jdk/src/share/classes/java/sql/package.html b/jdk/src/share/classes/java/sql/package.html index d60cb5354ce..ce13ffa9dca 100644 --- a/jdk/src/share/classes/java/sql/package.html +++ b/jdk/src/share/classes/java/sql/package.html @@ -44,7 +44,7 @@ The reader/writer facility, available through the javax.sql.RowSet group of interfaces, can be customized to use and update data from a spread sheet, flat file, or any other tabular data source. -

    +

    What the JDBCTM 4.2 API Includes

    The JDBCTM 4.2 API includes both the java.sql package, referred to as the JDBC core API, @@ -56,7 +56,7 @@ The javax.sql package extends the functionality of the JDBC API from a client-side API to a server-side API, and it is an essential part of the JavaTM Enterprise Edition (Java EETM) technology. -

    +

    Versions

    The JDBC 4.2 API incorporates all of the previous JDBC API versions: -

    +

    java.sql and javax.sql Features Introduced in the JDBC 4.2 API

    -

    +

    java.sql and javax.sql Features Introduced in the JDBC 4.1 API

    -

    -

    + +

    java.sql and javax.sql Features Introduced in the JDBC 3.0 API

    -

    +

    java.sql Features Introduced in the JDBC 2.1 Core API

    -

    +

    javax.sql Features Introduced in the JDBC 2.0 Optional Package API

    -

    -

    + +

    Custom Mapping of UDTs

    A user-defined type (UDT) defined in SQL can be mapped to a class in the Java programming language. An SQL structured type or an SQL DISTINCT @@ -325,16 +324,16 @@ object back to its SQL type to store it in the data source. -

    + @since 1.1