Make designer compatible with java 7

* Addition of methods in interfaces. Whether these method will be internally used remains to be seen.
Teiid-Designer · Jan 28, 2013 · 5b4d073 · 5b4d073
1 parent 987a38a
commit 5b4d073
Show file tree

Hide file tree

Showing 8 changed files with 99 additions and 2 deletions.
diff --git a/plugins/org.teiid.designer.jdbc/src/org/teiid/designer/jdbc/custom/ResultSetImpl.java b/plugins/org.teiid.designer.jdbc/src/org/teiid/designer/jdbc/custom/ResultSetImpl.java
@@ -21,6 +21,7 @@
 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;
@@ -1616,4 +1617,14 @@ public <T> T unwrap( Class<T> iface ) {
 
         return null;
     }
+
+    public <T> T getObject(int columnIndex,
+                           Class<T> type) throws SQLException {
+        return null;
+    }
+
+    public <T> T getObject(String columnLabel,
+                           Class<T> type) throws SQLException {
+        return null;
+    }
 }
diff --git a/...er.modelgenerator.xml/src/org/teiid/designer/modelgenerator/xml/model/ConnectionImpl.java b/...er.modelgenerator.xml/src/org/teiid/designer/modelgenerator/xml/model/ConnectionImpl.java
@@ -16,6 +16,8 @@
 import java.sql.NClob;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
 import java.sql.SQLWarning;
 import java.sql.SQLXML;
 import java.sql.Savepoint;
@@ -24,7 +26,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
-
+import java.util.concurrent.Executor;
 import org.teiid.designer.modelgenerator.xml.wizards.StateManager;
 import org.teiid.designer.schema.tools.processing.RelationshipProcessor;
 
@@ -479,4 +481,24 @@ public <T> T unwrap( Class<T> iface ) {
         return null;
     }
 
+    public void setSchema(String schema) throws SQLException {
+        throw new SQLFeatureNotSupportedException();
+    }
+
+    public String getSchema() throws SQLException {
+        throw new SQLFeatureNotSupportedException();
+    }
+
+    public void abort(Executor executor) throws SQLException {
+        throw new SQLFeatureNotSupportedException();
+    }
+
+    public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
+        throw new SQLFeatureNotSupportedException();
+    }
+
+    public int getNetworkTimeout() throws SQLException {
+        throw new SQLFeatureNotSupportedException();
+    }
+
 }
diff --git a/...elgenerator.xml/src/org/teiid/designer/modelgenerator/xml/model/DatabaseMetaDataImpl.java b/...elgenerator.xml/src/org/teiid/designer/modelgenerator/xml/model/DatabaseMetaDataImpl.java
@@ -14,6 +14,8 @@
 import java.io.Writer;
 import java.sql.Connection;
 import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
 import java.sql.Types;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -1495,4 +1497,15 @@ protected void catalogsChanged() {
     public Map getNamespacePrefixes( String name ) {
         return schemaModel.getNamespacePrefixes();
     }
+
+    public ResultSet getPseudoColumns(String catalog,
+                                      String schemaPattern,
+                                      String tableNamePattern,
+                                      String columnNamePattern) throws SQLException {
+        throw new SQLFeatureNotSupportedException();
+    }
+
+    public boolean generatedKeyAlwaysReturned() throws SQLException {
+        return false;
+    }
 }
diff --git a/...gner.modelgenerator.xml/src/org/teiid/designer/modelgenerator/xml/model/MapResultSet.java b/...gner.modelgenerator.xml/src/org/teiid/designer/modelgenerator/xml/model/MapResultSet.java
@@ -27,6 +27,7 @@
 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;
@@ -1937,4 +1938,12 @@ public <T> T unwrap( Class<T> iface ) {
 
         return null;
     }
+
+    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();
+    }
 }
diff --git a/plugins/teiid/org.teiid.7.7.x b/plugins/teiid/org.teiid.7.7.x
diff --git a/tests/org.teiid.designer.jdbc.test.framework/src/org/teiid/designer/jdbc/FakeConnection.java b/tests/org.teiid.designer.jdbc.test.framework/src/org/teiid/designer/jdbc/FakeConnection.java
@@ -23,6 +23,7 @@
 import java.sql.Struct;
 import java.util.Map;
 import java.util.Properties;
+import java.util.concurrent.Executor;
 
 /**
  * FakeConnection
@@ -573,4 +574,22 @@ public boolean isWrapperFor( Class<?> iface ) {
     public <T> T unwrap( Class<T> iface ) {
         return null;
     }
+
+    public void setSchema(String schema) throws SQLException {
+    }
+
+    public String getSchema() throws SQLException {
+        return null;
+    }
+
+    public void abort(Executor executor) throws SQLException {
+    }
+
+    public void setNetworkTimeout(Executor executor,
+                                  int milliseconds) throws SQLException {
+    }
+
+    public int getNetworkTimeout() throws SQLException {
+        return 0;
+    }
 }
diff --git a/...r.jdbc.test.framework/src/org/teiid/designer/jdbc/metadata/impl/FakeDatabaseMetaData.java b/...r.jdbc.test.framework/src/org/teiid/designer/jdbc/metadata/impl/FakeDatabaseMetaData.java
@@ -11,6 +11,7 @@
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
 import java.sql.RowIdLifetime;
+import java.sql.SQLException;
 
 /**
  * FakeDatabaseMetaData
@@ -1470,4 +1471,15 @@ public <T> T unwrap( Class<T> iface ) {
         return null;
     }
 
+    public ResultSet getPseudoColumns(String catalog,
+                                      String schemaPattern,
+                                      String tableNamePattern,
+                                      String columnNamePattern) throws SQLException {
+        return null;
+    }
+
+    public boolean generatedKeyAlwaysReturned() throws SQLException {
+        return false;
+    }
+
 }
diff --git a/...designer.jdbc.test.framework/src/org/teiid/designer/jdbc/metadata/impl/FakeResultSet.java b/...designer.jdbc.test.framework/src/org/teiid/designer/jdbc/metadata/impl/FakeResultSet.java
@@ -20,6 +20,7 @@
 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;
@@ -1541,5 +1542,15 @@ public <T> T unwrap( Class<T> iface ) {
 
         return null;
     }
+
+    public <T> T getObject(int columnIndex,
+                           Class<T> type) throws SQLException {
+        return null;
+    }
+
+    public <T> T getObject(String columnLabel,
+                           Class<T> type) throws SQLException {
+        return null;
+    }
 
 }