Remove DBErrorDetailsProvider

Author: psainics

database-commons/src/main/java/io/cdap/plugin/db/DBErrorDetailsProvider.java

@@ -47,7 +47,6 @@
 import io.cdap.plugin.db.ConnectionConfig;
 import io.cdap.plugin.db.ConnectionConfigAccessor;
 import io.cdap.plugin.db.DBConfig;
-import io.cdap.plugin.db.DBErrorDetailsProvider;
 import io.cdap.plugin.db.DBRecord;
 import io.cdap.plugin.db.Operation;
 import io.cdap.plugin.db.SchemaReader;
@@ -313,18 +312,18 @@ private Schema inferSchema(Class<? extends Driver> driverClass) {
         }
       } catch (SQLException e) {
         // wrap exception to ensure SQLException-child instances not exposed to contexts w/o jdbc driver in classpath
+        String errorMessage = e.getMessage();
         String errorMessageWithDetails = String.format("Error while reading table metadata." +
           "Error message: '%s'. Error code: '%s'. SQLState: '%s'", e.getMessage(), e.getErrorCode(), e.getSQLState());
         String externalDocumentationLink = getExternalDocumentationLink();
         if (!Strings.isNullOrEmpty(externalDocumentationLink)) {
-          if (!errorMessageWithDetails.endsWith(".")) {
-            errorMessageWithDetails = errorMessageWithDetails + ".";
+          if (!errorMessage.endsWith(".")) {
+            errorMessage = errorMessage + ".";
           }
-          errorMessageWithDetails = String.format("%s For more details, see %s", errorMessageWithDetails,
-            externalDocumentationLink);
+          errorMessage = String.format("%s For more details, see %s", errorMessageWithDetails, errorMessage);
         }
         throw ErrorUtils.getProgramFailureException(new ErrorCategory(ErrorCategory.ErrorCategoryEnum.PLUGIN),
-          e.getMessage(), errorMessageWithDetails, ErrorType.USER, false, ErrorCodeType.SQLSTATE,
+          errorMessage, errorMessageWithDetails, ErrorType.USER, false, ErrorCodeType.SQLSTATE,
           e.getSQLState(), externalDocumentationLink, new SQLException(e.getMessage(),
             e.getSQLState(), e.getErrorCode()));
       }

database-commons/src/main/java/io/cdap/plugin/db/sink/AbstractDBSink.java

@@ -46,7 +46,6 @@
 import io.cdap.plugin.db.ConnectionConfig;
 import io.cdap.plugin.db.ConnectionConfigAccessor;
 import io.cdap.plugin.db.DBConfig;
-import io.cdap.plugin.db.DBErrorDetailsProvider;
 import io.cdap.plugin.db.DBRecord;
 import io.cdap.plugin.db.SchemaReader;
 import io.cdap.plugin.db.TransactionIsolationLevel;
@@ -201,18 +200,18 @@ private Schema loadSchemaFromDB(Class<? extends Driver> driverClass)
 
     } catch (SQLException e) {
       // wrap exception to ensure SQLException-child instances not exposed to contexts without jdbc driver in classpath
+      String errorMessage = e.getMessage();
       String errorMessageWithDetails = String.format("Error occurred while trying to get schema from database." +
         "Error message: '%s'. Error code: '%s'. SQLState: '%s'", e.getMessage(), e.getErrorCode(), e.getSQLState());
       String externalDocumentationLink = getExternalDocumentationLink();
       if (!Strings.isNullOrEmpty(externalDocumentationLink)) {
-        if (!errorMessageWithDetails.endsWith(".")) {
-          errorMessageWithDetails = errorMessageWithDetails + ".";
+        if (!errorMessage.endsWith(".")) {
+          errorMessage = errorMessage + ".";
         }
-        errorMessageWithDetails = String.format("%s For more details, see %s", errorMessageWithDetails,
-          externalDocumentationLink);
+        errorMessage = String.format("%s For more details, see %s", errorMessage, externalDocumentationLink);
       }
       throw ErrorUtils.getProgramFailureException(new ErrorCategory(ErrorCategory.ErrorCategoryEnum.PLUGIN),
-        e.getMessage(), errorMessageWithDetails, ErrorType.USER, false, ErrorCodeType.SQLSTATE,
+        errorMessage, errorMessageWithDetails, ErrorType.USER, false, ErrorCodeType.SQLSTATE,
         e.getSQLState(), externalDocumentationLink, new SQLException(e.getMessage(),
           e.getSQLState(), e.getErrorCode()));
     } finally {

database-commons/src/main/java/io/cdap/plugin/db/source/AbstractDBSource.java

@@ -17,7 +17,7 @@
 package io.cdap.plugin.mysql;
 
 import io.cdap.cdap.api.exception.ErrorType;
-import io.cdap.plugin.db.DBErrorDetailsProvider;
+import io.cdap.plugin.common.db.DBErrorDetailsProvider;
 import io.cdap.plugin.util.DBUtils;
 
 /**
@@ -31,7 +31,7 @@ protected String getExternalDocumentationLink() {
   }
 
   @Override
-  protected ErrorType getErrorTypeFromErrorCode(int errorCode, String sqlState) {
+  protected ErrorType getErrorTypeFromErrorCodeAndSqlState(int errorCode, String sqlState) {
     // https://dev.mysql.com/doc/refman/9.0/en/error-message-elements.html#error-code-ranges
     if (errorCode >= 1000 && errorCode <= 5999) {
       return ErrorType.USER;

mysql-plugin/src/main/java/io/cdap/plugin/mysql/MysqlErrorDetailsProvider.java

@@ -153,6 +153,11 @@
         <artifactId>hydrator-common</artifactId>
         <version>${cdap.plugin.version}</version>
       </dependency>
+      <dependency>
+        <groupId>io.cdap.plugin</groupId>
+        <artifactId>database-plugins</artifactId>
+        <version>${cdap.plugin.version}</version>
+      </dependency>
       <dependency>
         <groupId>io.cdap.cdap</groupId>
         <artifactId>cdap-test</artifactId>

pom.xml

@@ -19,7 +19,7 @@
 import com.google.common.base.Strings;
 import io.cdap.cdap.api.exception.ErrorCategory;
 import io.cdap.cdap.api.exception.ErrorType;
-import io.cdap.plugin.db.DBErrorDetailsProvider;
+import io.cdap.plugin.common.db.DBErrorDetailsProvider;
 import io.cdap.plugin.util.DBUtils;
 
 import java.util.HashMap;
@@ -77,7 +77,7 @@ protected String getExternalDocumentationLink() {
   }
 
   @Override
-  protected ErrorType getErrorTypeFromErrorCode(int errorCode, String sqlState) {
+  protected ErrorType getErrorTypeFromErrorCodeAndSqlState(int errorCode, String sqlState) {
     if (!Strings.isNullOrEmpty(sqlState) && sqlState.length() >= 2 &&
       ERROR_CODE_TO_ERROR_TYPE.containsKey(sqlState.substring(0, 2))) {
       return ERROR_CODE_TO_ERROR_TYPE.get(sqlState.substring(0, 2));