diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcColumnHandle.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcColumnHandle.java index 8f8cac58b577..6de88fbf4d75 100644 --- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcColumnHandle.java +++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcColumnHandle.java @@ -41,15 +41,6 @@ public JdbcColumnHandle(String columnName, JdbcTypeHandle jdbcTypeHandle, Type c this(columnName, jdbcTypeHandle, columnType, true, Optional.empty()); } - /** - * @deprecated Use {@link #builder()} instead. - */ - @Deprecated - public JdbcColumnHandle(String columnName, JdbcTypeHandle jdbcTypeHandle, Type columnType, boolean nullable) - { - this(columnName, jdbcTypeHandle, columnType, nullable, Optional.empty()); - } - /** * @deprecated This constructor is intended to be used by JSON deserialization only. Use {@link #builder()} instead. */ diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestDefaultJdbcQueryBuilder.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestDefaultJdbcQueryBuilder.java index 9d792047bb66..e9a740403404 100644 --- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestDefaultJdbcQueryBuilder.java +++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestDefaultJdbcQueryBuilder.java @@ -575,12 +575,11 @@ public void testAggregation() { List projectedColumns = ImmutableList.of( this.columns.get(2), - new JdbcColumnHandle( - "s", - JDBC_BIGINT, - BIGINT, - true, - Optional.empty())); + JdbcColumnHandle.builder() + .setColumnName("s") + .setJdbcTypeHandle(JDBC_BIGINT) + .setColumnType(BIGINT) + .build()); Connection connection = database.getConnection(); @@ -619,12 +618,11 @@ public void testAggregationWithFilter() List projectedColumns = ImmutableList.of( this.columns.get(2), - new JdbcColumnHandle( - "s", - JDBC_BIGINT, - BIGINT, - true, - Optional.empty())); + JdbcColumnHandle.builder() + .setColumnName("s") + .setJdbcTypeHandle(JDBC_BIGINT) + .setColumnType(BIGINT) + .build()); Connection connection = database.getConnection(); diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcColumnHandle.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcColumnHandle.java index fbba9dd8485c..b0d60b4c9e9d 100644 --- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcColumnHandle.java +++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcColumnHandle.java @@ -30,7 +30,14 @@ public class TestJdbcColumnHandle @Test public void testJsonRoundTrip() { - assertJsonRoundTrip(COLUMN_CODEC, new JdbcColumnHandle("columnName", JDBC_VARCHAR, VARCHAR, true, Optional.of("some comment"))); + assertJsonRoundTrip( + COLUMN_CODEC, + JdbcColumnHandle.builder() + .setColumnName("columnName") + .setJdbcTypeHandle(JDBC_VARCHAR) + .setColumnType(VARCHAR) + .setComment(Optional.of("some comment")) + .build()); } @Test