Author: reschke
Date: Thu Jun 11 13:58:32 2015
New Revision: 1684894
URL: http://svn.apache.org/r1684894
Log:
OAK-1266: DataSourceWrapper for RDBDocumentStore tests that implements some
logging - fix problems when compiling against JDK 1.6 JRE caused by new methods
introduced in 7.
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionWrapper.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceWrapper.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBPreparedStatementWrapper.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBResultSetWrapper.java
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionWrapper.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionWrapper.java?rev=1684894&r1=1684893&r2=1684894&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionWrapper.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionWrapper.java
Thu Jun 11 13:58:32 2015
@@ -26,6 +26,7 @@ import java.sql.NClob;
import java.sql.PreparedStatement;
import java.sql.SQLClientInfoException;
import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
import java.sql.SQLWarning;
import java.sql.SQLXML;
import java.sql.Savepoint;
@@ -48,8 +49,10 @@ public class RDBConnectionWrapper implem
this.constart = System.nanoTime();
}
+ // needed in Java 7...
+ @SuppressWarnings("unused")
public void abort(Executor arg0) throws SQLException {
- connection.abort(arg0);
+ throw new SQLFeatureNotSupportedException();
}
public void clearWarnings() throws SQLException {
@@ -156,12 +159,16 @@ public class RDBConnectionWrapper implem
return connection.getMetaData();
}
+ // needed in Java 7...
+ @SuppressWarnings("unused")
public int getNetworkTimeout() throws SQLException {
- return connection.getNetworkTimeout();
+ throw new SQLFeatureNotSupportedException();
}
+ // needed in Java 7...
+ @SuppressWarnings("unused")
public String getSchema() throws SQLException {
- return connection.getSchema();
+ throw new SQLFeatureNotSupportedException();
}
public int getTransactionIsolation() throws SQLException {
@@ -297,8 +304,10 @@ public class RDBConnectionWrapper implem
connection.setHoldability(arg0);
}
+ // needed in Java 7...
+ @SuppressWarnings("unused")
public void setNetworkTimeout(Executor arg0, int arg1) throws SQLException
{
- connection.setNetworkTimeout(arg0, arg1);
+ throw new SQLFeatureNotSupportedException();
}
public void setReadOnly(boolean arg0) throws SQLException {
@@ -313,8 +322,10 @@ public class RDBConnectionWrapper implem
return connection.setSavepoint(arg0);
}
+ // needed in Java 7...
+ @SuppressWarnings("unused")
public void setSchema(String arg0) throws SQLException {
- connection.setSchema(arg0);
+ throw new SQLFeatureNotSupportedException();
}
public void setTransactionIsolation(int arg0) throws SQLException {
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceWrapper.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceWrapper.java?rev=1684894&r1=1684893&r2=1684894&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceWrapper.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceWrapper.java
Thu Jun 11 13:58:32 2015
@@ -112,8 +112,10 @@ public class RDBDataSourceWrapper implem
return ds.getLoginTimeout();
}
+ // needed in Java 7...
+ @SuppressWarnings("unused")
public Logger getParentLogger() throws SQLFeatureNotSupportedException {
- return ds.getParentLogger();
+ throw new SQLFeatureNotSupportedException();
}
public boolean isWrapperFor(Class<?> iface) throws SQLException {
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBPreparedStatementWrapper.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBPreparedStatementWrapper.java?rev=1684894&r1=1684893&r2=1684894&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBPreparedStatementWrapper.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBPreparedStatementWrapper.java
Thu Jun 11 13:58:32 2015
@@ -33,6 +33,7 @@ import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.RowId;
import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
import java.sql.SQLWarning;
import java.sql.SQLXML;
import java.sql.Time;
@@ -82,8 +83,10 @@ public class RDBPreparedStatementWrapper
statement.close();
}
+ // needed in Java 7...
+ @SuppressWarnings("unused")
public void closeOnCompletion() throws SQLException {
- statement.closeOnCompletion();
+ throw new SQLFeatureNotSupportedException();
}
public boolean execute() throws SQLException {
@@ -244,8 +247,10 @@ public class RDBPreparedStatementWrapper
return statement.getWarnings();
}
+ // needed in Java 7...
+ @SuppressWarnings("unused")
public boolean isCloseOnCompletion() throws SQLException {
- return statement.isCloseOnCompletion();
+ throw new SQLFeatureNotSupportedException();
}
public boolean isClosed() throws SQLException {
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBResultSetWrapper.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBResultSetWrapper.java?rev=1684894&r1=1684893&r2=1684894&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBResultSetWrapper.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBResultSetWrapper.java
Thu Jun 11 13:58:32 2015
@@ -30,6 +30,7 @@ import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.RowId;
import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
import java.sql.SQLWarning;
import java.sql.SQLXML;
import java.sql.Statement;
@@ -288,8 +289,10 @@ public class RDBResultSetWrapper impleme
return resultSet.getNString(columnLabel);
}
+ // needed in Java 7...
+ @SuppressWarnings("unused")
public <T> T getObject(int columnIndex, Class<T> type) throws SQLException
{
- return resultSet.getObject(columnIndex, type);
+ throw new SQLFeatureNotSupportedException();
}
public Object getObject(int columnIndex, Map<String, Class<?>> map) throws
SQLException {
@@ -300,8 +303,10 @@ public class RDBResultSetWrapper impleme
return resultSet.getObject(columnIndex);
}
+ // needed in Java 7...
+ @SuppressWarnings("unused")
public <T> T getObject(String columnLabel, Class<T> type) throws
SQLException {
- return resultSet.getObject(columnLabel, type);
+ throw new SQLFeatureNotSupportedException();
}
public Object getObject(String columnLabel, Map<String, Class<?>> map)
throws SQLException {
