From 09c3dbfd091dd998e88beeabf905cfb8a9ff17fd Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 18 Sep 2013 17:27:07 +0200 Subject: [PATCH] [#2717] DefaultResultSet depends on Java 1.7 / JDBC 4.1 --- .../org/jooq/tools/jdbc/DefaultResultSet.java | 53 ++++++++----------- .../org/jooq/tools/jdbc/JDBC41Connection.java | 16 +++--- .../org/jooq/tools/jdbc/JDBC41ResultSet.java | 8 +-- .../org/jooq/tools/jdbc/JDBC41Statement.java | 16 +++--- 4 files changed, 41 insertions(+), 52 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/tools/jdbc/DefaultResultSet.java b/jOOQ/src/main/java/org/jooq/tools/jdbc/DefaultResultSet.java index 75429656d8..6432084881 100644 --- a/jOOQ/src/main/java/org/jooq/tools/jdbc/DefaultResultSet.java +++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/DefaultResultSet.java @@ -40,27 +40,27 @@ */ package org.jooq.tools.jdbc; -import java.io.InputStream; -import java.io.Reader; -import java.math.BigDecimal; -import java.net.URL; -import java.sql.Array; -import java.sql.Blob; -import java.sql.Clob; -import java.sql.Date; -import java.sql.NClob; -import java.sql.Ref; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.RowId; -import java.sql.SQLException; -import java.sql.SQLWarning; -import java.sql.SQLXML; -import java.sql.Statement; -import java.sql.Time; -import java.sql.Timestamp; -import java.util.Calendar; -import java.util.Map; +import java.io.InputStream; +import java.io.Reader; +import java.math.BigDecimal; +import java.net.URL; +import java.sql.Array; +import java.sql.Blob; +import java.sql.Clob; +import java.sql.Date; +import java.sql.NClob; +import java.sql.Ref; +import java.sql.ResultSet; +import java.sql.ResultSetMetaData; +import java.sql.RowId; +import java.sql.SQLException; +import java.sql.SQLWarning; +import java.sql.SQLXML; +import java.sql.Statement; +import java.sql.Time; +import java.sql.Timestamp; +import java.util.Calendar; +import java.util.Map; /** * A default JDBC ResultSet implementation delegating all JDBC 4.0 calls to an @@ -1028,15 +1028,4 @@ public class DefaultResultSet extends JDBC41ResultSet implements ResultSet { public void updateNClob(String columnLabel, Reader reader) throws SQLException { delegate.updateNClob(columnLabel, reader); } - - @Override - public T getObject(int columnIndex, Class type) throws SQLException { - return delegate.getObject(columnIndex, type); - } - - @Override - public T getObject(String columnLabel, Class type) throws SQLException { - return delegate.getObject(columnLabel, type); - } - } diff --git a/jOOQ/src/main/java/org/jooq/tools/jdbc/JDBC41Connection.java b/jOOQ/src/main/java/org/jooq/tools/jdbc/JDBC41Connection.java index dc258ee560..9f1ff47e42 100644 --- a/jOOQ/src/main/java/org/jooq/tools/jdbc/JDBC41Connection.java +++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/JDBC41Connection.java @@ -40,9 +40,9 @@ */ package org.jooq.tools.jdbc; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.concurrent.Executor; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.concurrent.Executor; /** * Add JDBC 4.1 API compliance to a JDBC 4.0 {@link Connection}. @@ -56,31 +56,31 @@ public abstract class JDBC41Connection { // JDBC 4.1 compliance: @Override @SuppressWarnings("unused") - public void setSchema(String s) throws SQLException { + public final void setSchema(String s) throws SQLException { throw new UnsupportedOperationException("Not supported yet."); } // JDBC 4.1 compliance: @Override @SuppressWarnings("unused") - public String getSchema() throws SQLException { + public final String getSchema() throws SQLException { throw new UnsupportedOperationException("Not supported yet."); } // JDBC 4.1 compliance: @Override @SuppressWarnings("unused") - public void abort(Executor executor) throws SQLException { + public final void abort(Executor executor) throws SQLException { throw new UnsupportedOperationException("Not supported yet."); } // JDBC 4.1 compliance: @Override @SuppressWarnings("unused") - public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException { + public final void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException { throw new UnsupportedOperationException("Not supported yet."); } // JDBC 4.1 compliance: @Override @SuppressWarnings("unused") - public int getNetworkTimeout() throws SQLException { + public final int getNetworkTimeout() throws SQLException { throw new UnsupportedOperationException("Not supported yet."); } } diff --git a/jOOQ/src/main/java/org/jooq/tools/jdbc/JDBC41ResultSet.java b/jOOQ/src/main/java/org/jooq/tools/jdbc/JDBC41ResultSet.java index 1a7b00cd6c..8332501a63 100644 --- a/jOOQ/src/main/java/org/jooq/tools/jdbc/JDBC41ResultSet.java +++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/JDBC41ResultSet.java @@ -40,8 +40,8 @@ */ package org.jooq.tools.jdbc; -import java.sql.ResultSet; -import java.sql.SQLException; +import java.sql.ResultSet; +import java.sql.SQLException; /** * Add JDBC 4.1 API compliance to a JDBC 4.0 {@link ResultSet}. @@ -55,13 +55,13 @@ public abstract class JDBC41ResultSet { // JDBC 4.1 compliance: @Override @SuppressWarnings("unused") - public T getObject(int columnIndex, Class type) throws SQLException { + public final T getObject(int columnIndex, Class type) throws SQLException { throw new UnsupportedOperationException("Not supported yet."); } // JDBC 4.1 compliance: @Override @SuppressWarnings("unused") - public T getObject(String columnLabel, Class type) throws SQLException { + public final T getObject(String columnLabel, Class type) throws SQLException { throw new UnsupportedOperationException("Not supported yet."); } } diff --git a/jOOQ/src/main/java/org/jooq/tools/jdbc/JDBC41Statement.java b/jOOQ/src/main/java/org/jooq/tools/jdbc/JDBC41Statement.java index d41ac3c031..254860f2e8 100644 --- a/jOOQ/src/main/java/org/jooq/tools/jdbc/JDBC41Statement.java +++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/JDBC41Statement.java @@ -40,10 +40,10 @@ */ package org.jooq.tools.jdbc; -import java.sql.CallableStatement; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; +import java.sql.CallableStatement; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; /** * Add JDBC 4.1 API compliance to a JDBC 4.0 {@link Statement}. @@ -62,13 +62,13 @@ public abstract class JDBC41Statement { // JDBC 4.1 compliance: @Override @SuppressWarnings("unused") - public void closeOnCompletion() throws SQLException { + public final void closeOnCompletion() throws SQLException { throw new UnsupportedOperationException("Not supported yet."); } // JDBC 4.1 compliance: @Override @SuppressWarnings("unused") - public boolean isCloseOnCompletion() throws SQLException { + public final boolean isCloseOnCompletion() throws SQLException { throw new UnsupportedOperationException("Not supported yet."); } @@ -78,13 +78,13 @@ public abstract class JDBC41Statement { // JDBC 4.1 compliance: @Override @SuppressWarnings("unused") - public T getObject(int parameterIndex, Class type) throws SQLException { + public final T getObject(int parameterIndex, Class type) throws SQLException { throw new UnsupportedOperationException("Not supported yet."); } // JDBC 4.1 compliance: @Override @SuppressWarnings("unused") - public T getObject(String parameterName, Class type) throws SQLException { + public final T getObject(String parameterName, Class type) throws SQLException { throw new UnsupportedOperationException("Not supported yet."); } }