Fixed issue where the getTable API was incorrectly returning TableNotFoundException instead of ConnectorException. (Netflix#246)

* Fixed issue where the getTable API was incorrectly returning TableNotFoundException instead of ConnectorException.

Author: ajoymajumdar

metacat-connector-jdbc/src/main/java/com/netflix/metacat/connector/jdbc/services/JdbcConnectorTableService.java

@@ -25,6 +25,7 @@
 import com.netflix.metacat.common.dto.Sort;
 import com.netflix.metacat.common.server.connectors.ConnectorRequestContext;
 import com.netflix.metacat.common.server.connectors.ConnectorTableService;
+import com.netflix.metacat.common.server.connectors.exception.ConnectorException;
 import com.netflix.metacat.common.server.connectors.exception.TableNotFoundException;
 import com.netflix.metacat.common.server.connectors.model.FieldInfo;
 import com.netflix.metacat.common.server.connectors.model.TableInfo;
@@ -147,7 +148,7 @@ public TableInfo get(@Nonnull final ConnectorRequestContext context, @Nonnull fi
             log.debug("Finished getting table metadata for qualified name {} for request {}", name, context);
             return result;
         } catch (final SQLException se) {
-            throw this.exceptionMapper.toConnectorException(se, name);
+            throw new ConnectorException(se.getMessage(), se);
         }
     }
 
@@ -156,7 +157,7 @@ public TableInfo get(@Nonnull final ConnectorRequestContext context, @Nonnull fi
      * @param connection db connection
      * @param tableInfo table info
      */
-    protected void setTableInfoDetails(final Connection connection, final TableInfo tableInfo) throws SQLException { }
+    protected void setTableInfoDetails(final Connection connection, final TableInfo tableInfo) { }
 
     /**
      * {@inheritDoc}

metacat-connector-mysql/src/main/java/com/netflix/metacat/connector/mysql/MySqlConnectorTableService.java

@@ -7,19 +7,20 @@
 import com.netflix.metacat.connector.jdbc.JdbcExceptionMapper;
 import com.netflix.metacat.connector.jdbc.JdbcTypeConverter;
 import com.netflix.metacat.connector.jdbc.services.JdbcConnectorTableService;
+import lombok.extern.slf4j.Slf4j;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.SQLException;
 
 /**
  * Mysql table service implementation.
  *
  * @author amajumdar
  * @since 1.2.0
  */
+@Slf4j
 public class MySqlConnectorTableService extends JdbcConnectorTableService {
     private static final String COL_CREATE_TIME = "create_time";
     private static final String COL_UPDATE_TIME = "update_time";
@@ -44,7 +45,7 @@ public MySqlConnectorTableService(
      * {@inheritDoc}
      */
     @Override
-    protected void setTableInfoDetails(final Connection connection, final TableInfo tableInfo) throws SQLException {
+    protected void setTableInfoDetails(final Connection connection, final TableInfo tableInfo) {
         final QualifiedName tableName = tableInfo.getName();
         try (
             final PreparedStatement statement = connection.prepareStatement(SQL_GET_AUDIT_INFO)
@@ -59,6 +60,8 @@ protected void setTableInfoDetails(final Connection connection, final TableInfo
                     tableInfo.setAudit(auditInfo);
                 }
             }
+        } catch (final Exception ignored) {
+            log.info("Ignoring. Error getting the audit info for table {}", tableName);
         }
     }
 }

metacat-connector-snowflake/src/main/java/com/netflix/metacat/connector/snowflake/SnowflakeConnectorTableService.java

@@ -27,14 +27,14 @@
 import com.netflix.metacat.connector.jdbc.JdbcExceptionMapper;
 import com.netflix.metacat.connector.jdbc.JdbcTypeConverter;
 import com.netflix.metacat.connector.jdbc.services.JdbcConnectorTableService;
+import lombok.extern.slf4j.Slf4j;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.List;
 
 /**
@@ -43,6 +43,7 @@
  * @author amajumdar
  * @since 1.2.0
  */
+@Slf4j
 public class SnowflakeConnectorTableService extends JdbcConnectorTableService {
     private static final String COL_CREATED = "CREATED";
     private static final String COL_LAST_ALTERED = "LAST_ALTERED";
@@ -137,7 +138,7 @@ public boolean exists(@Nonnull final ConnectorRequestContext context, @Nonnull f
      * {@inheritDoc}
      */
     @Override
-    protected void setTableInfoDetails(final Connection connection, final TableInfo tableInfo) throws SQLException {
+    protected void setTableInfoDetails(final Connection connection, final TableInfo tableInfo) {
         final QualifiedName tableName = getSnowflakeName(tableInfo.getName());
         try (
             final PreparedStatement statement = connection.prepareStatement(SQL_GET_AUDIT_INFO)
@@ -153,6 +154,8 @@ protected void setTableInfoDetails(final Connection connection, final TableInfo
                     tableInfo.setAudit(auditInfo);
                 }
             }
+        } catch (final Exception ignored) {
+            log.info("Ignoring. Error getting the audit info for table {}", tableName);
         }
     }
 }

metacat-connector-snowflake/src/test/groovy/com/netflix/metacat/connector/snowflake/SnowflakeConnectorTableServiceSpec.groovy

@@ -155,7 +155,7 @@ class SnowflakeConnectorTableServiceSpec extends Specification {
         then:
         1 * connection.prepareStatement(_) >> statement
         1 * statement.executeQuery() >> {throw new SQLException()}
-        thrown(SQLException)
+        noExceptionThrown()
         when:
         table = TableInfo.builder().name(name).build()
         this.service.setTableInfoDetails(connection, table)