db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1742861 - in /db/derby/code/trunk/java: client/org/apache/derby/jdbc/ engine/org/apache/derby/jdbc/
Date Mon, 09 May 2016 01:22:04 GMT
Author: rhillegas
Date: Mon May  9 01:22:04 2016
New Revision: 1742861

URL: http://svn.apache.org/viewvc?rev=1742861&view=rev
Log:
DERBY-6856: Revert ShardingKey changes introduced by revision 1742858.

Modified:
    db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientXADataSource40.java
    db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource.java
    db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource40.java
    db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSourceInterface.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSourceInterface.java

Modified: db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientXADataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientXADataSource40.java?rev=1742861&r1=1742860&r2=1742861&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientXADataSource40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientXADataSource40.java Mon
May  9 01:22:04 2016
@@ -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 @@ public class BasicClientXADataSource40
 
         return getXAConnectionMinion(user, password);
     }
-
-    /** Added by Java 9 */
-    public ShardingKeyBuilder createShardingKeyBuilder()
-        throws SQLException
-    {
-        throw new java.sql.SQLFeatureNotSupportedException();
-    }
 }

Modified: db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource.java?rev=1742861&r1=1742860&r2=1742861&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource.java Mon May
 9 01:22:04 2016
@@ -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 class ClientXADataSource
     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();
-    }
 }

Modified: db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource40.java?rev=1742861&r1=1742860&r2=1742861&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource40.java Mon May
 9 01:22:04 2016
@@ -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 @@ import javax.sql.XADataSource;
 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;
 }

Modified: db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSourceInterface.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSourceInterface.java?rev=1742861&r1=1742860&r2=1742861&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSourceInterface.java
(original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSourceInterface.java
Mon May  9 01:22:04 2016
@@ -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 @@ import javax.sql.XADataSource;
  */
 public interface ClientXADataSourceInterface
     extends ClientDataSourceInterface, XADataSource {
-
-    /** Added by Java 9 */
-    public default ShardingKeyBuilder createShardingKeyBuilder()
-        throws SQLException
-    {
-        throw new java.sql.SQLFeatureNotSupportedException();
-    }
 }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSourceInterface.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSourceInterface.java?rev=1742861&r1=1742860&r2=1742861&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSourceInterface.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSourceInterface.java
Mon May  9 01:22:04 2016
@@ -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();
 }



Mime
View raw message