DERBY-6856: Accidentally checked in the ShardingKey changes again; reverting.
git-svn-id: https://svn.apache.org/repos/asf/db/derby/code/trunk@1746068 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/java/client/org/apache/derby/jdbc/BasicClientXADataSource40.java b/java/client/org/apache/derby/jdbc/BasicClientXADataSource40.java
index a852dcc..76b871c 100644
--- a/java/client/org/apache/derby/jdbc/BasicClientXADataSource40.java
+++ b/java/client/org/apache/derby/jdbc/BasicClientXADataSource40.java
@@ -21,9 +21,7 @@
package org.apache.derby.jdbc;
-import java.sql.ShardingKeyBuilder;
import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
import javax.sql.XAConnection;
import javax.sql.XADataSource;
@@ -58,11 +56,4 @@
return getXAConnectionMinion(user, password);
}
-
- /** Added by Java 9 */
- public ShardingKeyBuilder createShardingKeyBuilder()
- throws SQLException
- {
- throw new java.sql.SQLFeatureNotSupportedException();
- }
}
diff --git a/java/client/org/apache/derby/jdbc/ClientXADataSource.java b/java/client/org/apache/derby/jdbc/ClientXADataSource.java
index a3fd7ee..a559e8e 100644
--- a/java/client/org/apache/derby/jdbc/ClientXADataSource.java
+++ b/java/client/org/apache/derby/jdbc/ClientXADataSource.java
@@ -21,9 +21,6 @@
package org.apache.derby.jdbc;
-import java.sql.ShardingKeyBuilder;
-import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
import java.sql.SQLException;
import javax.sql.XAConnection;
@@ -69,11 +66,4 @@
public XAConnection getXAConnection(String user, String password) throws SQLException {
return getXAConnectionMinion(user, password);
}
-
- /** Added by Java 9 */
- public ShardingKeyBuilder createShardingKeyBuilder()
- throws SQLException
- {
- throw new java.sql.SQLFeatureNotSupportedException();
- }
}
diff --git a/java/client/org/apache/derby/jdbc/ClientXADataSource40.java b/java/client/org/apache/derby/jdbc/ClientXADataSource40.java
index 84946d9..77a54c9 100644
--- a/java/client/org/apache/derby/jdbc/ClientXADataSource40.java
+++ b/java/client/org/apache/derby/jdbc/ClientXADataSource40.java
@@ -21,9 +21,6 @@
package org.apache.derby.jdbc;
-import java.sql.ShardingKeyBuilder;
-import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
import javax.sql.XADataSource;
/**
@@ -38,12 +35,5 @@
public class ClientXADataSource40 extends ClientXADataSource
implements XADataSource /* compile-time check for 4.1 extension */
{
- private static final long serialVersionUID = -3463444509507830926L;
-
- /** Added by Java 9 */
- public ShardingKeyBuilder createShardingKeyBuilder()
- throws SQLException
- {
- throw new java.sql.SQLFeatureNotSupportedException();
- }
+ private static final long serialVersionUID = -3463444509507830926L;
}
diff --git a/java/client/org/apache/derby/jdbc/ClientXADataSourceInterface.java b/java/client/org/apache/derby/jdbc/ClientXADataSourceInterface.java
index 0331e60..60d6ac1 100644
--- a/java/client/org/apache/derby/jdbc/ClientXADataSourceInterface.java
+++ b/java/client/org/apache/derby/jdbc/ClientXADataSourceInterface.java
@@ -21,9 +21,6 @@
package org.apache.derby.jdbc;
-import java.sql.ShardingKeyBuilder;
-import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
import javax.sql.XADataSource;
/**
@@ -31,11 +28,4 @@
*/
public interface ClientXADataSourceInterface
extends ClientDataSourceInterface, XADataSource {
-
- /** Added by Java 9 */
- public default ShardingKeyBuilder createShardingKeyBuilder()
- throws SQLException
- {
- throw new java.sql.SQLFeatureNotSupportedException();
- }
}
diff --git a/java/engine/org/apache/derby/jdbc/EmbeddedXADataSourceInterface.java b/java/engine/org/apache/derby/jdbc/EmbeddedXADataSourceInterface.java
index 91fd396..93c8996 100644
--- a/java/engine/org/apache/derby/jdbc/EmbeddedXADataSourceInterface.java
+++ b/java/engine/org/apache/derby/jdbc/EmbeddedXADataSourceInterface.java
@@ -21,24 +21,12 @@
package org.apache.derby.jdbc;
-import java.sql.ShardingKeyBuilder;
-import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
-
import org.apache.derby.iapi.jdbc.ResourceAdapter;
/**
* Common interface of Derby embedded XA data sources.
*/
-public interface EmbeddedXADataSourceInterface extends EmbeddedDataSourceInterface, javax.sql.XADataSource
-{
- public ResourceAdapter getResourceAdapter();
-
- /** Added by Java 9 */
- public default ShardingKeyBuilder createShardingKeyBuilder()
- throws SQLException
- {
- throw new java.sql.SQLFeatureNotSupportedException();
- }
+public interface EmbeddedXADataSourceInterface extends EmbeddedDataSourceInterface, javax.sql.XADataSource {
+ ResourceAdapter getResourceAdapter();
}
