Author: andy
Date: Wed Aug 28 22:32:36 2013
New Revision: 1518407
URL: http://svn.apache.org/r1518407
Log:
Add Java7/JDBC operations so that the code compiles in Java6 and Java7
Modified:
jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/JenaDriver.java
jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/connections/JenaConnection.java
jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/metadata/JenaMetadata.java
jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/metadata/results/MetaResultSet.java
jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/JenaResultSet.java
jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/statements/JenaStatement.java
Modified:
jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/JenaDriver.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/JenaDriver.java?rev=1518407&r1=1518406&r2=1518407&view=diff
==============================================================================
---
jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/JenaDriver.java
(original)
+++
jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/JenaDriver.java
Wed Aug 28 22:32:36 2013
@@ -28,6 +28,7 @@ import java.sql.Connection;
import java.sql.Driver;
import java.sql.DriverPropertyInfo;
import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -1016,4 +1017,8 @@ public abstract class JenaDriver impleme
return value.equals(actualValue);
}
+ // Java6/7 compatibility
+ public java.util.logging.Logger getParentLogger() throws
SQLFeatureNotSupportedException {
+ throw new SQLFeatureNotSupportedException() ;
+ }
}
Modified:
jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/connections/JenaConnection.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/connections/JenaConnection.java?rev=1518407&r1=1518406&r2=1518407&view=diff
==============================================================================
---
jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/connections/JenaConnection.java
(original)
+++
jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/connections/JenaConnection.java
Wed Aug 28 22:32:36 2013
@@ -860,4 +860,24 @@ public abstract class JenaConnection imp
this.setWarning(new SQLWarning(warning, cause));
}
+ //--- Java6/7 compatibility.
+ public void setSchema(String schema) throws SQLException {
+ throw new SQLFeatureNotSupportedException();
+ }
+
+ public String getSchema() throws SQLException {
+ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void abort(java.util.concurrent.Executor executor) throws
SQLException {
+ throw new SQLFeatureNotSupportedException();
+ }
+
+ public int getNetworkTimeout() throws SQLException {
+ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void setNetworkTimeout(java.util.concurrent.Executor executor,
int milliseconds) throws SQLException {
+ throw new SQLFeatureNotSupportedException();
+ }
}
Modified:
jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/metadata/JenaMetadata.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/metadata/JenaMetadata.java?rev=1518407&r1=1518406&r2=1518407&view=diff
==============================================================================
---
jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/metadata/JenaMetadata.java
(original)
+++
jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/metadata/JenaMetadata.java
Wed Aug 28 22:32:36 2013
@@ -1185,4 +1185,15 @@ public abstract class JenaMetadata imple
@Override
public abstract boolean usesLocalFiles() throws SQLException;
+ public ResultSet getPseudoColumns(String catalog,
+
String schemaPattern,
+
String tableNamePattern,
+
String columnNamePattern) throws SQLException {
+ throw new SQLFeatureNotSupportedException();
+ }
+
+ // Java 6/7 compatibility
+ public boolean generatedKeyAlwaysReturned() throws SQLException {
+ throw new SQLFeatureNotSupportedException();
+ }
}
Modified:
jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/metadata/results/MetaResultSet.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/metadata/results/MetaResultSet.java?rev=1518407&r1=1518406&r2=1518407&view=diff
==============================================================================
---
jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/metadata/results/MetaResultSet.java
(original)
+++
jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/metadata/results/MetaResultSet.java
Wed Aug 28 22:32:36 2013
@@ -623,6 +623,15 @@ public class MetaResultSet implements Re
throw new SQLFeatureNotSupportedException();
}
+ // Java 6/7 compatibility
+ public <T> T getObject(int columnIndex, Class<T> type) throws
SQLException {
+ throw new SQLFeatureNotSupportedException();
+ }
+
+ public <T> T getObject(String columnLabel, Class<T> type) throws
SQLException {
+ throw new SQLFeatureNotSupportedException();
+ }
+
@Override
public SQLWarning getWarnings() throws SQLException {
// TODO Auto-generated method stub
@@ -1199,5 +1208,4 @@ public class MetaResultSet implements Re
public boolean wasNull() throws SQLException {
return this.wasNull;
}
-
}
Modified:
jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/JenaResultSet.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/JenaResultSet.java?rev=1518407&r1=1518406&r2=1518407&view=diff
==============================================================================
---
jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/JenaResultSet.java
(original)
+++
jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/JenaResultSet.java
Wed Aug 28 22:32:36 2013
@@ -700,6 +700,15 @@ public abstract class JenaResultSet impl
public InputStream getUnicodeStream(String columnLabel) throws
SQLException {
throw new SQLFeatureNotSupportedException();
}
+
+ // Java6/7 compatibility
+ public <T> T getObject(int columnIndex, Class<T> type) throws
SQLException {
+ throw new SQLFeatureNotSupportedException();
+ }
+
+ public <T> T getObject(String columnLabel, Class<T> type) throws
SQLException {
+ throw new SQLFeatureNotSupportedException();
+ }
@Override
public final SQLWarning getWarnings() throws SQLException {
Modified:
jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/statements/JenaStatement.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/statements/JenaStatement.java?rev=1518407&r1=1518406&r2=1518407&view=diff
==============================================================================
---
jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/statements/JenaStatement.java
(original)
+++
jena/trunk/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/statements/JenaStatement.java
Wed Aug 28 22:32:36 2013
@@ -834,4 +834,12 @@ public abstract class JenaStatement impl
this.timeout = seconds;
}
}
-}
+
+ // Java 6/7 compatibility
+ public boolean isCloseOnCompletion() throws SQLException {
+ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void closeOnCompletion() throws SQLException {
+ throw new SQLFeatureNotSupportedException();
+ }}
