Error handling v2 changes required for athena-jdbc

ritiktrianz · ritiktrianz · commit 8ee3a70a3f2c · 2025-03-17T13:23:09.000+05:30
diff --git a/athena-federation-sdk/src/main/java/com/amazonaws/athena/connector/credentials/DefaultCredentialsProvider.java b/athena-federation-sdk/src/main/java/com/amazonaws/athena/connector/credentials/DefaultCredentialsProvider.java
@@ -20,11 +20,12 @@
 package com.amazonaws.athena.connector.credentials;
 
 import com.amazonaws.athena.connector.lambda.exceptions.AthenaConnectorException;
-import com.amazonaws.services.glue.model.ErrorDetails;
-import com.amazonaws.services.glue.model.FederationSourceErrorCode;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import software.amazon.awssdk.services.glue.model.ErrorDetails;
+import software.amazon.awssdk.services.glue.model.FederationSourceErrorCode;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -62,7 +63,7 @@ public DefaultCredentialsProvider(final String secretString)
         }
         catch (IOException ioException) {
             throw new AthenaConnectorException("Could not deserialize RDS credentials into HashMap: ",
-                    new ErrorDetails().withErrorCode(FederationSourceErrorCode.InternalServiceException.toString()).withErrorMessage(ioException.getMessage()));
+                    ErrorDetails.builder().errorCode(FederationSourceErrorCode.INTERNAL_SERVICE_EXCEPTION.toString()).errorMessage(ioException.getMessage()).build());
         }
 
         this.defaultCredentials = new DefaultCredentials(rdsSecrets.get("username"), rdsSecrets.get("password"));
diff --git a/athena-federation-sdk/src/main/java/com/amazonaws/athena/connector/credentials/StaticCredentialsProvider.java b/athena-federation-sdk/src/main/java/com/amazonaws/athena/connector/credentials/StaticCredentialsProvider.java
@@ -20,10 +20,11 @@
 package com.amazonaws.athena.connector.credentials;
 
 import com.amazonaws.athena.connector.lambda.exceptions.AthenaConnectorException;
-import com.amazonaws.services.glue.model.ErrorDetails;
-import com.amazonaws.services.glue.model.FederationSourceErrorCode;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
+import software.amazon.awssdk.services.glue.model.ErrorDetails;
+import software.amazon.awssdk.services.glue.model.FederationSourceErrorCode;
 
 /**
  * Static credential provider.
@@ -42,7 +43,7 @@ public StaticCredentialsProvider(final DefaultCredentials defaultCredentials)
 
         if (StringUtils.isAnyBlank(jdbcCredential.getUser(), jdbcCredential.getPassword())) {
             throw new AthenaConnectorException("User or password must not be blank.",
-                    new ErrorDetails().withErrorCode(FederationSourceErrorCode.InvalidInputException.toString()));
+                    ErrorDetails.builder().errorCode(FederationSourceErrorCode.INVALID_INPUT_EXCEPTION.toString()).build());
         }
     }
 
diff --git a/athena-jdbc/src/main/java/com/amazonaws/athena/connectors/jdbc/connection/DatabaseConnectionConfigBuilder.java b/athena-jdbc/src/main/java/com/amazonaws/athena/connectors/jdbc/connection/DatabaseConnectionConfigBuilder.java
@@ -20,10 +20,11 @@
 package com.amazonaws.athena.connectors.jdbc.connection;
 
 import com.amazonaws.athena.connector.lambda.exceptions.AthenaConnectorException;
-import com.amazonaws.services.glue.model.ErrorDetails;
-import com.amazonaws.services.glue.model.FederationSourceErrorCode;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
+import software.amazon.awssdk.services.glue.model.ErrorDetails;
+import software.amazon.awssdk.services.glue.model.FederationSourceErrorCode;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -119,7 +120,7 @@ else if (key.endsWith(CONNECTION_STRING_PROPERTY_SUFFIX)) {
             }
             if (numberOfCatalogs > MUX_CATALOG_LIMIT) {
                 throw new AthenaConnectorException("Too many database instances in mux. Max supported is " + MUX_CATALOG_LIMIT,
-                        new ErrorDetails().withErrorCode(FederationSourceErrorCode.InvalidInputException.toString()));
+                        ErrorDetails.builder().errorCode(FederationSourceErrorCode.INVALID_INPUT_EXCEPTION.toString()).build());
             }
         }
 
@@ -137,7 +138,7 @@ private DatabaseConnectionConfig extractDatabaseConnectionConfig(final String ca
         }
         else {
             throw new AthenaConnectorException("Invalid connection String for Catalog " + catalogName,
-                    new ErrorDetails().withErrorCode(FederationSourceErrorCode.InvalidInputException.toString()));
+                    ErrorDetails.builder().errorCode(FederationSourceErrorCode.INVALID_INPUT_EXCEPTION.toString()).build());
         }
 
         Validate.notBlank(dbType, "Database type must not be blank.");
diff --git a/athena-jdbc/src/main/java/com/amazonaws/athena/connectors/jdbc/connection/GenericJdbcConnectionFactory.java b/athena-jdbc/src/main/java/com/amazonaws/athena/connectors/jdbc/connection/GenericJdbcConnectionFactory.java
@@ -23,6 +23,8 @@
 import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import software.amazon.awssdk.services.glue.model.ErrorDetails;
+import software.amazon.awssdk.services.glue.model.FederationSourceErrorCode;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -95,10 +97,10 @@ public Connection getConnection(final CredentialsProvider credentialsProvider)
         }
         catch (SQLException e) {
             if (e.getMessage().contains("Name or service not known")) {
-                throw new AthenaConnectorException(e.getMessage(), new ErrorDetails().withErrorCode(FederationSourceErrorCode.InvalidInputException.toString()));
+                throw new AthenaConnectorException(e.getMessage(), ErrorDetails.builder().errorCode(FederationSourceErrorCode.INVALID_INPUT_EXCEPTION.toString()).build());
             }
             else if (e.getMessage().contains("Incorrect username or password was specified.")) {
-                throw new AthenaConnectorException(e.getMessage(), new ErrorDetails().withErrorCode(FederationSourceErrorCode.InvalidCredentialsException.toString()));
+                throw new AthenaConnectorException(e.getMessage(), ErrorDetails.builder().errorCode(FederationSourceErrorCode.INVALID_CREDENTIALS_EXCEPTION.toString()).build());
             }
         }
         return connection;
@@ -111,7 +113,7 @@ private String encodeValue(String value)
         }
         catch (UnsupportedEncodingException ex) {
             throw new AthenaConnectorException("Unsupported Encoding Exception: ",
-                    new ErrorDetails().withErrorCode(FederationSourceErrorCode.OperationNotSupportedException.toString()).withErrorMessage(ex.getMessage()));
+                    ErrorDetails.builder().errorCode(FederationSourceErrorCode.OPERATION_NOT_SUPPORTED_EXCEPTION.toString()).errorMessage(ex.getMessage()).build());
         }
     }
 }
diff --git a/athena-jdbc/src/main/java/com/amazonaws/athena/connectors/jdbc/manager/DefaultJdbcFederationExpressionParser.java b/athena-jdbc/src/main/java/com/amazonaws/athena/connectors/jdbc/manager/DefaultJdbcFederationExpressionParser.java
@@ -21,9 +21,10 @@
 
 import com.amazonaws.athena.connector.lambda.domain.predicate.functions.FunctionName;
 import com.amazonaws.athena.connector.lambda.exceptions.AthenaConnectorException;
-import com.amazonaws.services.glue.model.ErrorDetails;
-import com.amazonaws.services.glue.model.FederationSourceErrorCode;
+
 import org.apache.arrow.vector.types.pojo.ArrowType;
+import software.amazon.awssdk.services.glue.model.ErrorDetails;
+import software.amazon.awssdk.services.glue.model.FederationSourceErrorCode;
 
 import java.util.List;
 
@@ -33,7 +34,7 @@ public class DefaultJdbcFederationExpressionParser extends FederationExpressionP
     public String mapFunctionToDataSourceSyntax(FunctionName functionName, ArrowType type, List<String> arguments)
     {
         throw new AthenaConnectorException("Subclass does not yet support complex expressions.",
-                new ErrorDetails().withErrorCode(FederationSourceErrorCode.OperationNotSupportedException.toString()));
+                ErrorDetails.builder().errorCode(FederationSourceErrorCode.OPERATION_NOT_SUPPORTED_EXCEPTION.toString()).build());
     }
     
 }
diff --git a/athena-jdbc/src/main/java/com/amazonaws/athena/connectors/jdbc/manager/FederationExpressionParser.java b/athena-jdbc/src/main/java/com/amazonaws/athena/connectors/jdbc/manager/FederationExpressionParser.java
@@ -27,8 +27,6 @@
 import com.amazonaws.athena.connector.lambda.domain.predicate.expression.VariableExpression;
 import com.amazonaws.athena.connector.lambda.domain.predicate.functions.FunctionName;
 import com.amazonaws.athena.connector.lambda.exceptions.AthenaConnectorException;
-import com.amazonaws.services.glue.model.ErrorDetails;
-import com.amazonaws.services.glue.model.FederationSourceErrorCode;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
@@ -37,6 +35,8 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import software.amazon.awssdk.services.glue.model.ErrorDetails;
+import software.amazon.awssdk.services.glue.model.FederationSourceErrorCode;
 
 import java.util.Collections;
 import java.util.List;
@@ -92,7 +92,7 @@ else if (argument instanceof FunctionCallExpression) {
                     return parseFunctionCallExpression((FunctionCallExpression) argument, accumulator);
                 }
                 throw new AthenaConnectorException("Should not reach this case - a new subclass was introduced and is not handled.",
-                        new ErrorDetails().withErrorCode(FederationSourceErrorCode.OperationNotSupportedException.toString()));
+                        ErrorDetails.builder().errorCode(FederationSourceErrorCode.OPERATION_NOT_SUPPORTED_EXCEPTION.toString()).build());
             }).collect(Collectors.toList());
 
         return mapFunctionToDataSourceSyntax(functionName, functionCallExpression.getType(), arguments);
diff --git a/athena-jdbc/src/main/java/com/amazonaws/athena/connectors/jdbc/manager/JDBCUtil.java b/athena-jdbc/src/main/java/com/amazonaws/athena/connectors/jdbc/manager/JDBCUtil.java
@@ -23,13 +23,13 @@
 import com.amazonaws.athena.connector.lambda.exceptions.AthenaConnectorException;
 import com.amazonaws.athena.connectors.jdbc.connection.DatabaseConnectionConfig;
 import com.amazonaws.athena.connectors.jdbc.connection.DatabaseConnectionConfigBuilder;
-import com.amazonaws.services.glue.model.ErrorDetails;
-import com.amazonaws.services.glue.model.FederationSourceErrorCode;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import software.amazon.awssdk.services.glue.model.ErrorDetails;
+import software.amazon.awssdk.services.glue.model.FederationSourceErrorCode;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -65,7 +65,7 @@ public static DatabaseConnectionConfig getSingleDatabaseConfigFromEnv(String dat
 
         throw new AthenaConnectorException(String.format("Must provide default connection string parameter %s for database type %s",
                 DatabaseConnectionConfigBuilder.DEFAULT_CONNECTION_STRING_PROPERTY, databaseEngine),
-                new ErrorDetails().withErrorCode(FederationSourceErrorCode.InvalidInputException.toString()));
+                ErrorDetails.builder().errorCode(FederationSourceErrorCode.INVALID_INPUT_EXCEPTION.toString()).build());
     }
 
     /**
@@ -85,7 +85,7 @@ public static Map<String, JdbcMetadataHandler> createJdbcMetadataHandlerMap(
 
         if (databaseConnectionConfigs.isEmpty()) {
             throw new AthenaConnectorException("At least one connection string required.",
-                    new ErrorDetails().withErrorCode(FederationSourceErrorCode.InvalidInputException.toString()));
+                    ErrorDetails.builder().errorCode(FederationSourceErrorCode.INVALID_INPUT_EXCEPTION.toString()).build());
         }
 
         boolean defaultPresent = false;
@@ -103,7 +103,7 @@ public static Map<String, JdbcMetadataHandler> createJdbcMetadataHandlerMap(
         if (!defaultPresent) {
             throw new AthenaConnectorException("Must provide connection parameters for default database instance " +
                     DatabaseConnectionConfigBuilder.DEFAULT_CONNECTION_STRING_PROPERTY,
-                    new ErrorDetails().withErrorCode(FederationSourceErrorCode.InvalidInputException.toString()));
+                    ErrorDetails.builder().errorCode(FederationSourceErrorCode.INVALID_INPUT_EXCEPTION.toString()).build());
         }
 
         return metadataHandlerMap.build();
@@ -125,7 +125,7 @@ public static Map<String, JdbcRecordHandler> createJdbcRecordHandlerMap(Map<Stri
 
         if (databaseConnectionConfigs.isEmpty()) {
             throw new AthenaConnectorException("At least one connection string required.",
-                    new ErrorDetails().withErrorCode(FederationSourceErrorCode.InvalidInputException.toString()));
+                    ErrorDetails.builder().errorCode(FederationSourceErrorCode.INVALID_INPUT_EXCEPTION.toString()).build());
         }
 
         boolean defaultPresent = false;
@@ -143,7 +143,7 @@ public static Map<String, JdbcRecordHandler> createJdbcRecordHandlerMap(Map<Stri
         if (!defaultPresent) {
             throw new AthenaConnectorException("Must provide connection parameters for default database instance " +
                     DatabaseConnectionConfigBuilder.DEFAULT_CONNECTION_STRING_PROPERTY,
-                    new ErrorDetails().withErrorCode(FederationSourceErrorCode.InvalidInputException.toString()));
+                    ErrorDetails.builder().errorCode(FederationSourceErrorCode.INVALID_INPUT_EXCEPTION.toString()).build());
         }
 
         return recordHandlerMap.build();
@@ -161,7 +161,7 @@ public static TableName informationSchemaCaseInsensitiveTableMatch(Connection co
             }
             else {
                 throw new AthenaConnectorException(String.format("During SCHEMA Case Insensitive look up could not find Database '%s'", databaseName),
-                        new ErrorDetails().withErrorCode(FederationSourceErrorCode.EntityNotFoundException.toString()));
+                        ErrorDetails.builder().errorCode(FederationSourceErrorCode.ENTITY_NOT_FOUND_EXCEPTION.toString()).build());
             }
         }
 
@@ -173,13 +173,13 @@ public static TableName informationSchemaCaseInsensitiveTableMatch(Connection co
                 resolvedName = resultSet.getString("table_name");
                 if (resultSet.next()) {
                     throw new AthenaConnectorException(String.format("More than one table that matches '%s' was returned from Database %s", tableName, databaseName),
-                            new ErrorDetails().withErrorCode(FederationSourceErrorCode.InvalidInputException.toString()));
+                            ErrorDetails.builder().errorCode(FederationSourceErrorCode.INVALID_INPUT_EXCEPTION.toString()).build());
                 }
                 LOGGER.info("Resolved name from Case Insensitive look up : {}", resolvedName);
             }
             else {
                 throw new AthenaConnectorException(String.format("During TABLE Case Insensitive look up could not find Table '%s' in Database '%s'", tableName, databaseName),
-                        new ErrorDetails().withErrorCode(FederationSourceErrorCode.EntityNotFoundException.toString()));
+                        ErrorDetails.builder().errorCode(FederationSourceErrorCode.ENTITY_NOT_FOUND_EXCEPTION.toString()).build());
             }
         }
 
diff --git a/athena-jdbc/src/main/java/com/amazonaws/athena/connectors/jdbc/manager/JdbcFederationExpressionParser.java b/athena-jdbc/src/main/java/com/amazonaws/athena/connectors/jdbc/manager/JdbcFederationExpressionParser.java
@@ -24,10 +24,10 @@
 import com.amazonaws.athena.connector.lambda.domain.predicate.functions.OperatorType;
 import com.amazonaws.athena.connector.lambda.domain.predicate.functions.StandardFunctions;
 import com.amazonaws.athena.connector.lambda.exceptions.AthenaConnectorException;
-import com.amazonaws.services.glue.model.ErrorDetails;
-import com.amazonaws.services.glue.model.FederationSourceErrorCode;
 import com.google.common.base.Joiner;
 import org.apache.arrow.vector.types.pojo.ArrowType;
+import software.amazon.awssdk.services.glue.model.ErrorDetails;
+import software.amazon.awssdk.services.glue.model.FederationSourceErrorCode;
 
 import java.util.List;
 
@@ -62,26 +62,26 @@ public String mapFunctionToDataSourceSyntax(FunctionName functionName, ArrowType
 
         if (arguments == null || arguments.size() == 0) {
             throw new AthenaConnectorException("Arguments cannot be null or empty.",
-                    new ErrorDetails().withErrorCode(FederationSourceErrorCode.InvalidInputException.toString()));
+                    ErrorDetails.builder().errorCode(FederationSourceErrorCode.INVALID_INPUT_EXCEPTION.toString()).build());
         }
         switch (operatorType) {
             case UNARY:
                 if (arguments.size() != 1) {
                     throw new AthenaConnectorException("Unary function type " + functionName.getFunctionName() + " was provided with " + arguments.size() + " arguments.",
-                            new ErrorDetails().withErrorCode(FederationSourceErrorCode.InvalidInputException.toString()));
+                            ErrorDetails.builder().errorCode(FederationSourceErrorCode.INVALID_INPUT_EXCEPTION.toString()).build());
                 }
                 break;
             case BINARY:
                 if (arguments.size() != 2) {
                     throw new AthenaConnectorException("Binary function type " + functionName.getFunctionName() + " was provided with " + arguments.size() + " arguments.",
-                            new ErrorDetails().withErrorCode(FederationSourceErrorCode.InvalidInputException.toString()));
+                            ErrorDetails.builder().errorCode(FederationSourceErrorCode.INVALID_INPUT_EXCEPTION.toString()).build());
                 }
                 break;
             case VARARG:
                 break;
             default:
                 throw new AthenaConnectorException("A new operator type was introduced without adding support for it.",
-                        new ErrorDetails().withErrorCode(FederationSourceErrorCode.OperationNotSupportedException.toString()));
+                        ErrorDetails.builder().errorCode(FederationSourceErrorCode.OPERATION_NOT_SUPPORTED_EXCEPTION.toString()).build());
         }
 
         String clause = "";
@@ -156,7 +156,7 @@ public String mapFunctionToDataSourceSyntax(FunctionName functionName, ArrowType
                 break;
             default:
                 throw new AthenaConnectorException("The function " + functionName.getFunctionName() + " does not have an implementation",
-                        new ErrorDetails().withErrorCode(FederationSourceErrorCode.OperationNotSupportedException.toString()));
+                        ErrorDetails.builder().errorCode(FederationSourceErrorCode.OPERATION_NOT_SUPPORTED_EXCEPTION.toString()).build());
         }
         if (clause == null) {
           return "";
diff --git a/athena-jdbc/src/main/java/com/amazonaws/athena/connectors/jdbc/manager/JdbcMetadataHandler.java b/athena-jdbc/src/main/java/com/amazonaws/athena/connectors/jdbc/manager/JdbcMetadataHandler.java
@@ -169,7 +169,7 @@ private Set<String> listDatabaseNames(final Connection jdbcConnection)
             return schemaNames.build();
         }
         catch (RuntimeException ex) {
-            throw new AthenaConnectorException("Invalid credentials was specified", new ErrorDetails().withErrorCode(FederationSourceErrorCode.InvalidCredentialsException.toString()));
+            throw new AthenaConnectorException("Invalid credentials was specified", ErrorDetails.builder().errorCode(FederationSourceErrorCode.INVALID_CREDENTIALS_EXCEPTION.toString()).build());
         }
     }
 
diff --git a/athena-jdbc/src/main/java/com/amazonaws/athena/connectors/jdbc/manager/JdbcSplitQueryBuilder.java b/athena-jdbc/src/main/java/com/amazonaws/athena/connectors/jdbc/manager/JdbcSplitQueryBuilder.java

Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,11 @@`
`20`	`20`	`package com.amazonaws.athena.connectors.jdbc.connection;`
`21`	`21`
`22`	`22`	`import com.amazonaws.athena.connector.lambda.exceptions.AthenaConnectorException;`
`23`		`-import com.amazonaws.services.glue.model.ErrorDetails;`
`24`		`-import com.amazonaws.services.glue.model.FederationSourceErrorCode;`
	`23`	`+`
`25`	`24`	`import org.apache.commons.lang3.StringUtils;`
`26`	`25`	`import org.apache.commons.lang3.Validate;`
	`26`	`+import software.amazon.awssdk.services.glue.model.ErrorDetails;`
	`27`	`+import software.amazon.awssdk.services.glue.model.FederationSourceErrorCode;`
`27`	`28`
`28`	`29`	`import java.util.ArrayList;`
`29`	`30`	`import java.util.List;`
`@@ -119,7 +120,7 @@ else if (key.endsWith(CONNECTION_STRING_PROPERTY_SUFFIX)) {`
`119`	`120`	`}`
`120`	`121`	`if (numberOfCatalogs > MUX_CATALOG_LIMIT) {`
`121`	`122`	`throw new AthenaConnectorException("Too many database instances in mux. Max supported is " + MUX_CATALOG_LIMIT,`
`122`		`- new ErrorDetails().withErrorCode(FederationSourceErrorCode.InvalidInputException.toString()));`
	`123`	`+ ErrorDetails.builder().errorCode(FederationSourceErrorCode.INVALID_INPUT_EXCEPTION.toString()).build());`
`123`	`124`	`}`
`124`	`125`	`}`
`125`	`126`
`@@ -137,7 +138,7 @@ private DatabaseConnectionConfig extractDatabaseConnectionConfig(final String ca`
`137`	`138`	`}`
`138`	`139`	`else {`
`139`	`140`	`throw new AthenaConnectorException("Invalid connection String for Catalog " + catalogName,`
`140`		`- new ErrorDetails().withErrorCode(FederationSourceErrorCode.InvalidInputException.toString()));`
	`141`	`+ ErrorDetails.builder().errorCode(FederationSourceErrorCode.INVALID_INPUT_EXCEPTION.toString()).build());`
`141`	`142`	`}`
`142`	`143`
`143`	`144`	`Validate.notBlank(dbType, "Database type must not be blank.");`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@`
`23`	`23`	`import org.apache.commons.lang3.Validate;`
`24`	`24`	`import org.slf4j.Logger;`
`25`	`25`	`import org.slf4j.LoggerFactory;`
	`26`	`+import software.amazon.awssdk.services.glue.model.ErrorDetails;`
	`27`	`+import software.amazon.awssdk.services.glue.model.FederationSourceErrorCode;`
`26`	`28`
`27`	`29`	`import java.io.UnsupportedEncodingException;`
`28`	`30`	`import java.net.URLEncoder;`
`@@ -95,10 +97,10 @@ public Connection getConnection(final CredentialsProvider credentialsProvider)`
`95`	`97`	`}`
`96`	`98`	`catch (SQLException e) {`
`97`	`99`	`if (e.getMessage().contains("Name or service not known")) {`
`98`		`- throw new AthenaConnectorException(e.getMessage(), new ErrorDetails().withErrorCode(FederationSourceErrorCode.InvalidInputException.toString()));`
	`100`	`+ throw new AthenaConnectorException(e.getMessage(), ErrorDetails.builder().errorCode(FederationSourceErrorCode.INVALID_INPUT_EXCEPTION.toString()).build());`
`99`	`101`	`}`
`100`	`102`	`else if (e.getMessage().contains("Incorrect username or password was specified.")) {`
`101`		`- throw new AthenaConnectorException(e.getMessage(), new ErrorDetails().withErrorCode(FederationSourceErrorCode.InvalidCredentialsException.toString()));`
	`103`	`+ throw new AthenaConnectorException(e.getMessage(), ErrorDetails.builder().errorCode(FederationSourceErrorCode.INVALID_CREDENTIALS_EXCEPTION.toString()).build());`
`102`	`104`	`}`
`103`	`105`	`}`
`104`	`106`	`return connection;`
`@@ -111,7 +113,7 @@ private String encodeValue(String value)`
`111`	`113`	`}`
`112`	`114`	`catch (UnsupportedEncodingException ex) {`
`113`	`115`	`throw new AthenaConnectorException("Unsupported Encoding Exception: ",`
`114`		`- new ErrorDetails().withErrorCode(FederationSourceErrorCode.OperationNotSupportedException.toString()).withErrorMessage(ex.getMessage()));`
	`116`	`+ ErrorDetails.builder().errorCode(FederationSourceErrorCode.OPERATION_NOT_SUPPORTED_EXCEPTION.toString()).errorMessage(ex.getMessage()).build());`
`115`	`117`	`}`
`116`	`118`	`}`
`117`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,10 @@`
`21`	`21`
`22`	`22`	`import com.amazonaws.athena.connector.lambda.domain.predicate.functions.FunctionName;`
`23`	`23`	`import com.amazonaws.athena.connector.lambda.exceptions.AthenaConnectorException;`
`24`		`-import com.amazonaws.services.glue.model.ErrorDetails;`
`25`		`-import com.amazonaws.services.glue.model.FederationSourceErrorCode;`
	`24`	`+`
`26`	`25`	`import org.apache.arrow.vector.types.pojo.ArrowType;`
	`26`	`+import software.amazon.awssdk.services.glue.model.ErrorDetails;`
	`27`	`+import software.amazon.awssdk.services.glue.model.FederationSourceErrorCode;`
`27`	`28`
`28`	`29`	`import java.util.List;`
`29`	`30`
`@@ -33,7 +34,7 @@ public class DefaultJdbcFederationExpressionParser extends FederationExpressionP`
`33`	`34`	`public String mapFunctionToDataSourceSyntax(FunctionName functionName, ArrowType type, List<String> arguments)`
`34`	`35`	`{`
`35`	`36`	`throw new AthenaConnectorException("Subclass does not yet support complex expressions.",`
`36`		`- new ErrorDetails().withErrorCode(FederationSourceErrorCode.OperationNotSupportedException.toString()));`
	`37`	`+ ErrorDetails.builder().errorCode(FederationSourceErrorCode.OPERATION_NOT_SUPPORTED_EXCEPTION.toString()).build());`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ private Set<String> listDatabaseNames(final Connection jdbcConnection)`
`169`	`169`	`return schemaNames.build();`
`170`	`170`	`}`
`171`	`171`	`catch (RuntimeException ex) {`
`172`		`- throw new AthenaConnectorException("Invalid credentials was specified", new ErrorDetails().withErrorCode(FederationSourceErrorCode.InvalidCredentialsException.toString()));`
	`172`	`+ throw new AthenaConnectorException("Invalid credentials was specified", ErrorDetails.builder().errorCode(FederationSourceErrorCode.INVALID_CREDENTIALS_EXCEPTION.toString()).build());`
`173`	`173`	`}`
`174`	`174`	`}`
`175`	`175`