You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/10/25 11:06:33 UTC
[tomcat] branch 7.0.x updated: Remove @Override annotations that
trigger errors with Java 6
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 5a93621 Remove @Override annotations that trigger errors with Java 6
5a93621 is described below
commit 5a936210440bd2a5f3c25857670acb2f7ee3e4f5
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Oct 25 13:06:13 2019 +0200
Remove @Override annotations that trigger errors with Java 6
---
test/org/apache/tomcat/dbcp/dbcp/TesterCallableStatement.java | 4 ++--
test/org/apache/tomcat/dbcp/dbcp/TesterConnection.java | 10 +++++-----
test/org/apache/tomcat/dbcp/dbcp/TesterDatabaseMetaData.java | 4 ++--
test/org/apache/tomcat/dbcp/dbcp/TesterDriver.java | 2 +-
test/org/apache/tomcat/dbcp/dbcp/TesterResultSet.java | 4 ++--
test/org/apache/tomcat/dbcp/dbcp/TesterStatement.java | 4 ++--
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/test/org/apache/tomcat/dbcp/dbcp/TesterCallableStatement.java b/test/org/apache/tomcat/dbcp/dbcp/TesterCallableStatement.java
index a4b9a42..4b9601b 100644
--- a/test/org/apache/tomcat/dbcp/dbcp/TesterCallableStatement.java
+++ b/test/org/apache/tomcat/dbcp/dbcp/TesterCallableStatement.java
@@ -458,13 +458,13 @@ public class TesterCallableStatement extends TesterPreparedStatement implements
/* JDBC_4_ANT_KEY_END */
/* JDBC_4_1_ANT_KEY_BEGIN */
- @Override
+ // No @Override else it won't compile with Java 6
public <T> T getObject(int parameterIndex, Class<T> type)
throws SQLException {
return null;
}
- @Override
+ // No @Override else it won't compile with Java 6
public <T> T getObject(String parameterName, Class<T> type)
throws SQLException {
return null;
diff --git a/test/org/apache/tomcat/dbcp/dbcp/TesterConnection.java b/test/org/apache/tomcat/dbcp/dbcp/TesterConnection.java
index 9e4e492..8834c71 100644
--- a/test/org/apache/tomcat/dbcp/dbcp/TesterConnection.java
+++ b/test/org/apache/tomcat/dbcp/dbcp/TesterConnection.java
@@ -337,28 +337,28 @@ public class TesterConnection implements Connection {
/* JDBC_4_ANT_KEY_END */
/* JDBC_4_1_ANT_KEY_BEGIN */
- @Override
+ // No @Override else it won't compile with Java 6
public void setSchema(String schema) throws SQLException {
throw new SQLException("Not implemented.");
}
- @Override
+ // No @Override else it won't compile with Java 6
public String getSchema() throws SQLException {
throw new SQLException("Not implemented.");
}
- @Override
+ // No @Override else it won't compile with Java 6
public void abort(Executor executor) throws SQLException {
throw new SQLException("Not implemented.");
}
- @Override
+ // No @Override else it won't compile with Java 6
public void setNetworkTimeout(Executor executor, int milliseconds)
throws SQLException {
throw new SQLException("Not implemented.");
}
- @Override
+ // No @Override else it won't compile with Java 6
public int getNetworkTimeout() throws SQLException {
throw new SQLException("Not implemented.");
}
diff --git a/test/org/apache/tomcat/dbcp/dbcp/TesterDatabaseMetaData.java b/test/org/apache/tomcat/dbcp/dbcp/TesterDatabaseMetaData.java
index c99c28b..fb571df 100644
--- a/test/org/apache/tomcat/dbcp/dbcp/TesterDatabaseMetaData.java
+++ b/test/org/apache/tomcat/dbcp/dbcp/TesterDatabaseMetaData.java
@@ -762,14 +762,14 @@ public class TesterDatabaseMetaData implements DatabaseMetaData {
/* JDBC_4_ANT_KEY_END */
/* JDBC_4_1_ANT_KEY_BEGIN */
- @Override
+ // No @Override else it won't compile with Java 6
public ResultSet getPseudoColumns(String catalog, String schemaPattern,
String tableNamePattern, String columnNamePattern)
throws SQLException {
return null;
}
- @Override
+ // No @Override else it won't compile with Java 6
public boolean generatedKeyAlwaysReturned() throws SQLException {
return false;
}
diff --git a/test/org/apache/tomcat/dbcp/dbcp/TesterDriver.java b/test/org/apache/tomcat/dbcp/dbcp/TesterDriver.java
index 6e2fca2..f59847e 100644
--- a/test/org/apache/tomcat/dbcp/dbcp/TesterDriver.java
+++ b/test/org/apache/tomcat/dbcp/dbcp/TesterDriver.java
@@ -119,7 +119,7 @@ public class TesterDriver implements Driver {
}
/* JDBC_4_1_ANT_KEY_BEGIN */
- @Override
+ // No @Override else it won't compile with Java 6
public Logger getParentLogger() throws SQLFeatureNotSupportedException {
throw new SQLFeatureNotSupportedException();
}
diff --git a/test/org/apache/tomcat/dbcp/dbcp/TesterResultSet.java b/test/org/apache/tomcat/dbcp/dbcp/TesterResultSet.java
index 6d562f4..465fa86 100644
--- a/test/org/apache/tomcat/dbcp/dbcp/TesterResultSet.java
+++ b/test/org/apache/tomcat/dbcp/dbcp/TesterResultSet.java
@@ -972,12 +972,12 @@ public class TesterResultSet implements ResultSet {
/* JDBC_4_ANT_KEY_END */
/* JDBC_4_1_ANT_KEY_BEGIN */
- @Override
+ // No @Override else it won't compile with Java 6
public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
throw new SQLException("Not implemented.");
}
- @Override
+ // No @Override else it won't compile with Java 6
public <T> T getObject(String columnLabel, Class<T> type)
throws SQLException {
throw new SQLException("Not implemented.");
diff --git a/test/org/apache/tomcat/dbcp/dbcp/TesterStatement.java b/test/org/apache/tomcat/dbcp/dbcp/TesterStatement.java
index 9aebccf..8d81e26 100644
--- a/test/org/apache/tomcat/dbcp/dbcp/TesterStatement.java
+++ b/test/org/apache/tomcat/dbcp/dbcp/TesterStatement.java
@@ -298,11 +298,11 @@ public class TesterStatement implements Statement {
/* JDBC_4_ANT_KEY_END */
/* JDBC_4_1_ANT_KEY_BEGIN */
- @Override
+ // No @Override else it won't compile with Java 6
public void closeOnCompletion() throws SQLException {
}
- @Override
+ // No @Override else it won't compile with Java 6
public boolean isCloseOnCompletion() throws SQLException {
return false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org