From 9b96c7eb337d9d4ff1a432c459701d0f15539391 Mon Sep 17 00:00:00 2001 From: Igor Motov Date: Fri, 10 Nov 2017 14:22:58 -0500 Subject: [PATCH] SQL: clean unused classes and empty close() methods (elastic/x-pack-elasticsearch#2956) relates elastic/x-pack-elasticsearch#2876 Original commit: elastic/x-pack-elasticsearch@c32c6a005848fb28c7941df68879848eabdc8b94 --- .../xpack/sql/cli/CliHttpClient.java | 4 +- .../xpack/sql/cli/HttpClient.java | 2 - .../sql/jdbc/jdbc/AbstractResultSet.java | 779 ------------------ .../xpack/sql/jdbc/jdbc/JdbcConnection.java | 1 - .../xpack/sql/jdbc/net/client/HttpClient.java | 2 - .../sql/jdbc/net/client/JdbcHttpClient.java | 7 +- 6 files changed, 2 insertions(+), 793 deletions(-) delete mode 100644 sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/jdbc/AbstractResultSet.java diff --git a/sql/cli/src/main/java/org/elasticsearch/xpack/sql/cli/CliHttpClient.java b/sql/cli/src/main/java/org/elasticsearch/xpack/sql/cli/CliHttpClient.java index 58baf746f32..4a79b40106c 100644 --- a/sql/cli/src/main/java/org/elasticsearch/xpack/sql/cli/CliHttpClient.java +++ b/sql/cli/src/main/java/org/elasticsearch/xpack/sql/cli/CliHttpClient.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.time.Instant; import java.util.TimeZone; -public class CliHttpClient implements AutoCloseable { +public class CliHttpClient { private final HttpClient http; private final CliConfiguration cfg; @@ -59,8 +59,6 @@ public class CliHttpClient implements AutoCloseable { throw new CliException(ex, "Cannot read response"); } } - - public void close() {} } diff --git a/sql/cli/src/main/java/org/elasticsearch/xpack/sql/cli/HttpClient.java b/sql/cli/src/main/java/org/elasticsearch/xpack/sql/cli/HttpClient.java index 03a391a3c75..42a94a0c8bf 100644 --- a/sql/cli/src/main/java/org/elasticsearch/xpack/sql/cli/HttpClient.java +++ b/sql/cli/src/main/java/org/elasticsearch/xpack/sql/cli/HttpClient.java @@ -34,6 +34,4 @@ class HttpClient { throw new RuntimeException("Transport failure", ex); } } - - void close() {} } \ No newline at end of file diff --git a/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/jdbc/AbstractResultSet.java b/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/jdbc/AbstractResultSet.java deleted file mode 100644 index e8af2c6f56f..00000000000 --- a/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/jdbc/AbstractResultSet.java +++ /dev/null @@ -1,779 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ -package org.elasticsearch.xpack.sql.jdbc.jdbc; - -import java.io.InputStream; -import java.io.Reader; -import java.math.BigDecimal; -import java.net.URL; -import java.sql.Array; -import java.sql.Blob; -import java.sql.Clob; -import java.sql.Date; -import java.sql.NClob; -import java.sql.Ref; -import java.sql.ResultSet; -import java.sql.RowId; -import java.sql.SQLException; -import java.sql.SQLFeatureNotSupportedException; -import java.sql.SQLWarning; -import java.sql.SQLXML; -import java.sql.Time; -import java.sql.Timestamp; - -abstract class AbstractResultSet implements ResultSet, JdbcWrapper { - - protected boolean closed = false; - - @Override - public boolean next() throws SQLException { - return false; - } - - @Override - public void close() { - if (!closed) { - closed = true; - } - } - - @Override - public boolean isClosed() { - return closed; - } - - @Override - @Deprecated - public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException { - throw new SQLFeatureNotSupportedException("BigDecimal not supported"); - } - - @Override - public InputStream getAsciiStream(int columnIndex) throws SQLException { - throw new SQLFeatureNotSupportedException("AsciiStream not supported"); - } - - @Override - @Deprecated - public InputStream getUnicodeStream(int columnIndex) throws SQLException { - throw new SQLFeatureNotSupportedException("UnicodeStream not supported"); - } - - @Override - public InputStream getBinaryStream(int columnIndex) throws SQLException { - throw new SQLFeatureNotSupportedException("BinaryStream not supported"); - } - - @Override - @Deprecated - public BigDecimal getBigDecimal(String columnLabel, int scale) throws SQLException { - throw new SQLFeatureNotSupportedException("BigDecimal not supported"); - } - - @Override - public InputStream getAsciiStream(String columnLabel) throws SQLException { - throw new SQLFeatureNotSupportedException("AsciiStream not supported"); - } - - @Override - @Deprecated - public InputStream getUnicodeStream(String columnLabel) throws SQLException { - throw new SQLFeatureNotSupportedException("UnicodeStream not supported"); - } - - @Override - public InputStream getBinaryStream(String columnLabel) throws SQLException { - throw new SQLFeatureNotSupportedException("BinaryStream not supported"); - } - - @Override - public SQLWarning getWarnings() throws SQLException { - checkOpen(); - return null; - } - - @Override - public void clearWarnings() throws SQLException { - checkOpen(); - } - - @Override - public String getCursorName() throws SQLException { - throw new SQLFeatureNotSupportedException("Cursor name not supported"); - } - - @Override - public Reader getCharacterStream(int columnIndex) throws SQLException { - throw new SQLFeatureNotSupportedException("CharacterStream not supported"); - } - - @Override - public Reader getCharacterStream(String columnLabel) throws SQLException { - throw new SQLFeatureNotSupportedException("CharacterStream not supported"); - } - - @Override - public BigDecimal getBigDecimal(int columnIndex) throws SQLException { - throw new SQLFeatureNotSupportedException("BigDecimal not supported"); - } - - @Override - public BigDecimal getBigDecimal(String columnLabel) throws SQLException { - throw new SQLFeatureNotSupportedException("BigDecimal not supported"); - } - - @Override - public void beforeFirst() throws SQLException { - throw new SQLException("ResultSet is forward-only"); - } - - @Override - public void afterLast() throws SQLException { - throw new SQLException("ResultSet is forward-only"); - } - - @Override - public boolean first() throws SQLException { - throw new SQLException("ResultSet is forward-only"); - } - - @Override - public boolean last() throws SQLException { - throw new SQLException("ResultSet is forward-only"); - } - - @Override - public boolean absolute(int row) throws SQLException { - throw new SQLException("ResultSet is forward-only"); - } - - @Override - public boolean relative(int rows) throws SQLException { - throw new SQLException("ResultSet is forward-only"); - } - - @Override - public boolean previous() throws SQLException { - throw new SQLException("ResultSet is forward-only"); - } - - @Override - public int getType() throws SQLException { - checkOpen(); - return TYPE_FORWARD_ONLY; - } - - @Override - public int getConcurrency() throws SQLException { - checkOpen(); - return CONCUR_READ_ONLY; - } - - @Override - public void setFetchDirection(int direction) throws SQLException { - checkOpen(); - if (direction != FETCH_FORWARD) { - throw new SQLException("Fetch direction must be FETCH_FORWARD"); - } - } - - @Override - public int getFetchDirection() throws SQLException { - checkOpen(); - return FETCH_FORWARD; - } - - @Override - public boolean rowUpdated() throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public boolean rowInserted() throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public boolean rowDeleted() throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateNull(int columnIndex) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateBoolean(int columnIndex, boolean x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateByte(int columnIndex, byte x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateShort(int columnIndex, short x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateInt(int columnIndex, int x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateLong(int columnIndex, long x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateFloat(int columnIndex, float x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateDouble(int columnIndex, double x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateBigDecimal(int columnIndex, BigDecimal x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateString(int columnIndex, String x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateBytes(int columnIndex, byte[] x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateDate(int columnIndex, Date x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateTime(int columnIndex, Time x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateTimestamp(int columnIndex, Timestamp x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateAsciiStream(int columnIndex, InputStream x, int length) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateBinaryStream(int columnIndex, InputStream x, int length) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateCharacterStream(int columnIndex, Reader x, int length) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateObject(int columnIndex, Object x, int scaleOrLength) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateObject(int columnIndex, Object x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateNull(String columnLabel) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateBoolean(String columnLabel, boolean x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateByte(String columnLabel, byte x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateShort(String columnLabel, short x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateInt(String columnLabel, int x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateLong(String columnLabel, long x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateFloat(String columnLabel, float x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateDouble(String columnLabel, double x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateBigDecimal(String columnLabel, BigDecimal x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateString(String columnLabel, String x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateBytes(String columnLabel, byte[] x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateDate(String columnLabel, Date x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateTime(String columnLabel, Time x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateTimestamp(String columnLabel, Timestamp x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateAsciiStream(String columnLabel, InputStream x, int length) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateBinaryStream(String columnLabel, InputStream x, int length) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateCharacterStream(String columnLabel, Reader reader, int length) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateObject(String columnLabel, Object x, int scaleOrLength) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateObject(String columnLabel, Object x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void insertRow() throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateRow() throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void deleteRow() throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void cancelRowUpdates() throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void moveToInsertRow() throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void refreshRow() throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void moveToCurrentRow() throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public Ref getRef(int columnIndex) throws SQLException { - throw new SQLFeatureNotSupportedException("Ref not supported"); - } - - @Override - public Blob getBlob(int columnIndex) throws SQLException { - throw new SQLFeatureNotSupportedException("Blob not supported"); - } - - @Override - public Clob getClob(int columnIndex) throws SQLException { - throw new SQLFeatureNotSupportedException("Clob not supported"); - } - - @Override - public Array getArray(int columnIndex) throws SQLException { - throw new SQLFeatureNotSupportedException("Array not supported"); - } - - @Override - public Ref getRef(String columnLabel) throws SQLException { - throw new SQLFeatureNotSupportedException("Ref not supported"); - } - - @Override - public Blob getBlob(String columnLabel) throws SQLException { - throw new SQLFeatureNotSupportedException("Blob not supported"); - } - - @Override - public Clob getClob(String columnLabel) throws SQLException { - throw new SQLFeatureNotSupportedException("Clob not supported"); - } - - @Override - public Array getArray(String columnLabel) throws SQLException { - throw new SQLFeatureNotSupportedException("Array not supported"); - } - - @Override - public URL getURL(int columnIndex) throws SQLException { - throw new SQLFeatureNotSupportedException("URL not supported"); - } - - @Override - public URL getURL(String columnLabel) throws SQLException { - throw new SQLFeatureNotSupportedException("URL not supported"); - } - - @Override - public void updateRef(int columnIndex, Ref x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateRef(String columnLabel, Ref x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateBlob(int columnIndex, Blob x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateBlob(String columnLabel, Blob x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateClob(int columnIndex, Clob x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateClob(String columnLabel, Clob x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateArray(int columnIndex, Array x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateArray(String columnLabel, Array x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public RowId getRowId(int columnIndex) throws SQLException { - throw new SQLFeatureNotSupportedException("RowId not supported"); - } - - @Override - public RowId getRowId(String columnLabel) throws SQLException { - throw new SQLFeatureNotSupportedException("RowId not supported"); - } - - @Override - public void updateRowId(int columnIndex, RowId x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateRowId(String columnLabel, RowId x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public int getHoldability() throws SQLException { - checkOpen(); - return HOLD_CURSORS_OVER_COMMIT; - } - - @Override - public void updateNString(int columnIndex, String nString) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateNString(String columnLabel, String nString) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateNClob(int columnIndex, NClob nClob) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateNClob(String columnLabel, NClob nClob) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public NClob getNClob(int columnIndex) throws SQLException { - throw new SQLFeatureNotSupportedException("NClob not supported"); - } - - @Override - public NClob getNClob(String columnLabel) throws SQLException { - throw new SQLFeatureNotSupportedException("NClob not supported"); - } - - @Override - public SQLXML getSQLXML(int columnIndex) throws SQLException { - throw new SQLFeatureNotSupportedException("SQLXML not supported"); - } - - @Override - public SQLXML getSQLXML(String columnLabel) throws SQLException { - throw new SQLFeatureNotSupportedException("SQLXML not supported"); - } - - @Override - public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public String getNString(int columnIndex) throws SQLException { - throw new SQLFeatureNotSupportedException("NString not supported"); - } - - @Override - public String getNString(String columnLabel) throws SQLException { - throw new SQLFeatureNotSupportedException("NString not supported"); - } - - @Override - public Reader getNCharacterStream(int columnIndex) throws SQLException { - throw new SQLFeatureNotSupportedException("NCharacterStream not supported"); - } - - @Override - public Reader getNCharacterStream(String columnLabel) throws SQLException { - throw new SQLFeatureNotSupportedException("NCharacterStream not supported"); - } - - @Override - public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateClob(int columnIndex, Reader reader, long length) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateClob(String columnLabel, Reader reader, long length) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateCharacterStream(int columnIndex, Reader x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateClob(int columnIndex, Reader reader) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateClob(String columnLabel, Reader reader) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateNClob(int columnIndex, Reader reader) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public void updateNClob(String columnLabel, Reader reader) throws SQLException { - throw new SQLFeatureNotSupportedException("Writes not supported"); - } - - @Override - public T getObject(int columnIndex, Class type) throws SQLException { - throw new SQLFeatureNotSupportedException("getObject not supported"); - } - - @Override - public T getObject(String columnLabel, Class type) throws SQLException { - throw new SQLFeatureNotSupportedException("getObject not supported"); - } - - @Override - public void setFetchSize(int rows) throws SQLException { - checkOpen(); - if (rows < 0) { - throw new SQLException("Rows is negative"); - } - // ignore fetch size since scrolls cannot be changed in flight - } - - void checkOpen() throws SQLException { - if (isClosed()) { - throw new SQLException("Closed result set"); - } - } -} \ No newline at end of file diff --git a/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/jdbc/JdbcConnection.java b/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/jdbc/JdbcConnection.java index 51fed09d196..cbd7fc805cd 100644 --- a/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/jdbc/JdbcConnection.java +++ b/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/jdbc/JdbcConnection.java @@ -119,7 +119,6 @@ public class JdbcConnection implements Connection, JdbcWrapper { if (!isClosed()) { closed = true; Debug.release(cfg); - client.close(); } } diff --git a/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/client/HttpClient.java b/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/client/HttpClient.java index bf4383d4846..0bfa032702f 100644 --- a/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/client/HttpClient.java +++ b/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/client/HttpClient.java @@ -72,6 +72,4 @@ class HttpClient { throw new JdbcSQLException(ex, "Transport failure"); } } - - void close() {} } \ No newline at end of file diff --git a/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/client/JdbcHttpClient.java b/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/client/JdbcHttpClient.java index 04366086af3..f2a8d3979b4 100644 --- a/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/client/JdbcHttpClient.java +++ b/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/client/JdbcHttpClient.java @@ -29,7 +29,6 @@ import org.elasticsearch.xpack.sql.protocol.shared.Request; import org.elasticsearch.xpack.sql.protocol.shared.Response; import org.elasticsearch.xpack.sql.protocol.shared.TimeoutInfo; -import java.io.Closeable; import java.io.DataInput; import java.io.DataInputStream; import java.io.IOException; @@ -37,7 +36,7 @@ import java.sql.SQLException; import java.time.Instant; import java.util.List; -public class JdbcHttpClient implements Closeable { +public class JdbcHttpClient { @FunctionalInterface interface DataInputFunction { R apply(DataInput in) throws IOException, SQLException; @@ -107,10 +106,6 @@ public class JdbcHttpClient implements Closeable { return doIO(ba, in -> ((MetaColumnResponse) readResponse(request, in)).columns); } - public void close() { - http.close(); - } - public void setNetworkTimeout(long millis) { http.setNetworkTimeout(millis); }