--- old/src/java.sql/share/classes/javax/sql/XAConnection.java 2016-01-13 16:42:17.000000000 -0500 +++ new/src/java.sql/share/classes/javax/sql/XAConnection.java 2016-01-13 16:42:17.000000000 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -52,121 +52,4 @@ * @since 1.4 */ javax.transaction.xa.XAResource getXAResource() throws SQLException; - - // JDBC 4.3 - - /** - * Sets and validates the sharding keys for this connection. - * - * @implSpec The default implementation will throw a - * {@code SQLFeatureNotSupportedException}. - * - * @apiNote This method validates that the sharding keys are valid for the - * {@code Connection}. The timeout value indicates how long the driver - * should wait for the {@code Connection} to verify that the sharding key is - * valid before {@code setShardingKeyIfValid} returns false. - * @param shardingKey the sharding key to be validated against this - * connection - * @param superShardingKey the super sharding key to be validated against - * this connection. The super sharding key may be {@code null}. - * @param timeout time in seconds before which the validation process is - * expected to be completed, otherwise the validation process is aborted. A - * value of 0 indicates the validation process will not time out. - * @return true if the connection is valid and the sharding keys are valid - * and set on this connection; false if the sharding keys are not valid or - * the timeout period expires before the operation completes. - * @throws SQLException if an error occurs while performing this validation; - * the {@code shardingkey} is {@code null}; a {@code superSharedingKey} is specified - * without a {@code shardingKey}; this method is called on a closed - * {@code connection}; or the {@code timeout} value is less than 0. - * @throws SQLFeatureNotSupportedException if the driver does not support - * sharding - * @since 1.9 - * @see ShardingKey - * @see ShardingKeyBuilder - */ - default boolean setShardingKeyIfValid(ShardingKey shardingKey, - ShardingKey superShardingKey, int timeout) - throws SQLException { - throw new SQLFeatureNotSupportedException("setShardingKeyIfValid not implemented"); - } - - /** - * Sets and validates the sharding key for this connection. - * @implSpec - * The default implementation will throw a - * {@code SQLFeatureNotSupportedException}. - * @apiNote - * This method validates that the sharding key is valid for the - * {@code Connection}. The timeout value indicates how long the driver - * should wait for the {@code Connection} to verify that the sharding key - * is valid before {@code setShardingKeyIfValid} returns false. - * @param shardingKey the sharding key to be validated against this connection - * @param timeout time in seconds before which the validation process is expected to - * be completed,else the validation process is aborted. A value of 0 indicates - * the validation process will not time out. - * @return true if the connection is valid and the sharding key is valid to be - * set on this connection; false if the sharding key is not valid or - * the timeout period expires before the operation completes. - * @throws SQLException if there is an error while performing this validation; - * this method is called on a closed {@code connection}; the {@code shardingkey} - * is {@code null}; or the {@code timeout} value is less than 0. - * @throws SQLFeatureNotSupportedException if the driver does not support sharding - * @since 1.9 - * @see ShardingKey - * @see ShardingKeyBuilder - */ - default boolean setShardingKeyIfValid(ShardingKey shardingKey, int timeout) - throws SQLException { - throw new SQLFeatureNotSupportedException("setShardingKeyIfValid not implemented"); - } - - /** - * Specifies a shardingKey and superShardingKey to use with this Connection - * @implSpec - * The default implementation will throw a - * {@code SQLFeatureNotSupportedException}. - * @apiNote - * This method sets the specified sharding keys but does not require a - * round trip to the database to validate that the sharding keys are valid - * for the {@code Connection}. - * @param shardingKey the sharding key to set on this connection. - * @param superShardingKey the super sharding key to set on this connection. - * The super sharding key may be {@code null} - * @throws SQLException if an error occurs setting the sharding keys; - * this method is called on a closed {@code connection}; - * the {@code shardingkey} is {@code null}; or - * a {@code superSharedingKey} is specified without a {@code shardingKey} - * @throws SQLFeatureNotSupportedException if the driver does not support sharding - * @since 1.9 - * @see ShardingKey - * @see ShardingKeyBuilder - */ - default void setShardingKey(ShardingKey shardingKey, ShardingKey superShardingKey) - throws SQLException { - throw new SQLFeatureNotSupportedException("setShardingKey not implemented"); - } - - /** - * Specifies a shardingKey to use with this Connection - * @implSpec - * The default implementation will throw a - * {@code SQLFeatureNotSupportedException}. - * @apiNote - * This method sets the specified sharding key but does not require a - * round trip to the database to validate that the sharding key is valid - * for the {@code Connection}. - * @param shardingKey the sharding key to set on this connection. - * @throws SQLException if an error occurs setting the sharding key; - * this method is called on a closed {@code connection}; or the - * {@code shardkingKey} is {@code null} - * @throws SQLFeatureNotSupportedException if the driver does not support sharding - * @since 1.9 - * @see ShardingKey - * @see ShardingKeyBuilder - */ - default void setShardingKey(ShardingKey shardingKey) - throws SQLException { - throw new SQLFeatureNotSupportedException("setShardingKey not implemented"); - } }