diff --git a/sql/cli-proto/src/main/java/org/elasticsearch/xpack/sql/cli/net/protocol/Proto.java b/sql/cli-proto/src/main/java/org/elasticsearch/xpack/sql/cli/net/protocol/Proto.java index dd54c765f8a..17af340d716 100644 --- a/sql/cli-proto/src/main/java/org/elasticsearch/xpack/sql/cli/net/protocol/Proto.java +++ b/sql/cli-proto/src/main/java/org/elasticsearch/xpack/sql/cli/net/protocol/Proto.java @@ -22,12 +22,12 @@ public final class Proto extends AbstractProto { @Override protected RequestType readRequestType(DataInput in) throws IOException { - return RequestType.read(in); + return RequestType.readFrom(in); } @Override protected ResponseType readResponseType(DataInput in) throws IOException { - return ResponseType.read(in); + return ResponseType.readFrom(in); } public enum RequestType implements AbstractProto.RequestType { @@ -41,7 +41,7 @@ public final class Proto extends AbstractProto { this.reader = reader; } - static RequestType read(DataInput in) throws IOException { + static RequestType readFrom(DataInput in) throws IOException { byte b = in.readByte(); try { return values()[b]; @@ -51,7 +51,7 @@ public final class Proto extends AbstractProto { } @Override - public void write(DataOutput out) throws IOException { + public void writeTo(DataOutput out) throws IOException { out.writeByte(ordinal()); } @@ -74,7 +74,7 @@ public final class Proto extends AbstractProto { this.reader = reader; } - static ResponseType read(DataInput in) throws IOException { + static ResponseType readFrom(DataInput in) throws IOException { byte b = in.readByte(); try { return values()[b]; @@ -84,7 +84,7 @@ public final class Proto extends AbstractProto { } @Override - public void write(DataOutput out) throws IOException { + public void writeTo(DataOutput out) throws IOException { out.writeByte(ordinal()); } diff --git a/sql/cli-proto/src/main/java/org/elasticsearch/xpack/sql/cli/net/protocol/QueryResponse.java b/sql/cli-proto/src/main/java/org/elasticsearch/xpack/sql/cli/net/protocol/QueryResponse.java index 2a96d98050c..d12af898c03 100644 --- a/sql/cli-proto/src/main/java/org/elasticsearch/xpack/sql/cli/net/protocol/QueryResponse.java +++ b/sql/cli-proto/src/main/java/org/elasticsearch/xpack/sql/cli/net/protocol/QueryResponse.java @@ -30,8 +30,8 @@ public abstract class QueryResponse extends AbstractQueryResponse { } @Override - protected void write(int clientVersion, DataOutput out) throws IOException { - super.write(clientVersion, out); + protected void writeTo(int clientVersion, DataOutput out) throws IOException { + super.writeTo(clientVersion, out); out.writeUTF(data); } diff --git a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/ColumnInfo.java b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/ColumnInfo.java index c27a71b41a9..7a8475ba34b 100644 --- a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/ColumnInfo.java +++ b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/ColumnInfo.java @@ -51,7 +51,7 @@ public class ColumnInfo { label = in.readUTF(); } - void write(DataOutput out) throws IOException { + void writeTo(DataOutput out) throws IOException { out.writeUTF(name); out.writeInt(type.getVendorTypeNumber()); out.writeUTF(table); diff --git a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/MetaColumnInfo.java b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/MetaColumnInfo.java index 221d3d6fdc3..0a50d0fa731 100644 --- a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/MetaColumnInfo.java +++ b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/MetaColumnInfo.java @@ -41,7 +41,7 @@ public class MetaColumnInfo { position = in.readInt(); } - void write(DataOutput out) throws IOException { + void writeTo(DataOutput out) throws IOException { out.writeUTF(table); out.writeUTF(name); out.writeInt(type.getVendorTypeNumber()); diff --git a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/MetaColumnRequest.java b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/MetaColumnRequest.java index 4c88d72bf21..7e63383a756 100644 --- a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/MetaColumnRequest.java +++ b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/MetaColumnRequest.java @@ -27,7 +27,7 @@ public class MetaColumnRequest extends Request { } @Override - protected void write(DataOutput out) throws IOException { + protected void writeTo(DataOutput out) throws IOException { out.writeUTF(tablePattern); out.writeUTF(columnPattern); } diff --git a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/MetaColumnResponse.java b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/MetaColumnResponse.java index cd0e1311503..d52365e0fdc 100644 --- a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/MetaColumnResponse.java +++ b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/MetaColumnResponse.java @@ -40,10 +40,10 @@ public class MetaColumnResponse extends Response { } @Override - protected void write(int clientVersion, DataOutput out) throws IOException { + protected void writeTo(int clientVersion, DataOutput out) throws IOException { out.writeInt(columns.size()); for (MetaColumnInfo info : columns) { - info.write(out); + info.writeTo(out); } } diff --git a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/MetaTableRequest.java b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/MetaTableRequest.java index b613d379e82..e5aa0d2b928 100644 --- a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/MetaTableRequest.java +++ b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/MetaTableRequest.java @@ -27,7 +27,7 @@ public class MetaTableRequest extends Request { } @Override - public void write(DataOutput out) throws IOException { + public void writeTo(DataOutput out) throws IOException { out.writeUTF(pattern); } diff --git a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/MetaTableResponse.java b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/MetaTableResponse.java index 5f79036e42f..f73f140d3be 100644 --- a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/MetaTableResponse.java +++ b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/MetaTableResponse.java @@ -38,7 +38,7 @@ public class MetaTableResponse extends Response { } @Override - public void write(int clientVersion, DataOutput out) throws IOException { + public void writeTo(int clientVersion, DataOutput out) throws IOException { out.writeInt(tables.size()); for (String t : tables) { out.writeUTF(t); diff --git a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/Page.java b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/Page.java index 89731d69b62..503d86db44a 100644 --- a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/Page.java +++ b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/Page.java @@ -36,7 +36,7 @@ public class Page implements Payload { private int maxRows; /** - * Build empty, call {@link #read(DataInput)} after to fill it. + * Build empty, call {@link #readFrom(DataInput)} after to fill it. */ Page(List columnInfo) { this.columnInfo = columnInfo; @@ -91,7 +91,7 @@ public class Page implements Payload { /** * Read a value from the stream */ - public void read(DataInput in) throws IOException { + public void readFrom(DataInput in) throws IOException { int rows = in.readInt(); // this.rows may be less than the number of rows we have space for if (rows > maxRows) { @@ -106,7 +106,7 @@ public class Page implements Payload { } } - public void write(DataOutput out) throws IOException { + public void writeTo(DataOutput out) throws IOException { int rows = rows(); out.writeInt(rows); for (int row = 0; row < rows; row++) { diff --git a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/Payload.java b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/Payload.java index 258b5049091..acc86c40464 100644 --- a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/Payload.java +++ b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/Payload.java @@ -11,7 +11,7 @@ import java.io.IOException; public interface Payload { - void read(DataInput in) throws IOException; + void readFrom(DataInput in) throws IOException; - void write(DataOutput out) throws IOException; + void writeTo(DataOutput out) throws IOException; } diff --git a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/Proto.java b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/Proto.java index a3f3c51dbf3..2a9547542cc 100644 --- a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/Proto.java +++ b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/Proto.java @@ -22,12 +22,12 @@ public final class Proto extends AbstractProto { @Override protected RequestType readRequestType(DataInput in) throws IOException { - return RequestType.read(in); + return RequestType.readFrom(in); } @Override protected ResponseType readResponseType(DataInput in) throws IOException { - return ResponseType.read(in); + return ResponseType.readFrom(in); } public enum RequestType implements AbstractProto.RequestType { @@ -45,7 +45,7 @@ public final class Proto extends AbstractProto { this.reader = reader; } - static RequestType read(DataInput in) throws IOException { + static RequestType readFrom(DataInput in) throws IOException { byte b = in.readByte(); try { return values()[b]; @@ -55,7 +55,7 @@ public final class Proto extends AbstractProto { } @Override - public void write(DataOutput out) throws IOException { + public void writeTo(DataOutput out) throws IOException { out.writeByte(ordinal()); } @@ -82,7 +82,7 @@ public final class Proto extends AbstractProto { this.reader = reader; } - static ResponseType read(DataInput in) throws IOException { + static ResponseType readFrom(DataInput in) throws IOException { byte b = in.readByte(); try { return values()[b]; @@ -92,7 +92,7 @@ public final class Proto extends AbstractProto { } @Override - public void write(DataOutput out) throws IOException { + public void writeTo(DataOutput out) throws IOException { out.writeByte(ordinal()); } diff --git a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/QueryInitResponse.java b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/QueryInitResponse.java index 100f94b56db..8ce384cc1a8 100644 --- a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/QueryInitResponse.java +++ b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/QueryInitResponse.java @@ -39,18 +39,18 @@ public class QueryInitResponse extends AbstractQueryResponse { this.columns = unmodifiableList(columns); // NOCOMMIT - Page is a client class, it shouldn't leak here Page data = new Page(columns); - data.read(in); + data.readFrom(in); this.data = data; } @Override - public void write(int clientVersion, DataOutput out) throws IOException { - super.write(clientVersion, out); + public void writeTo(int clientVersion, DataOutput out) throws IOException { + super.writeTo(clientVersion, out); out.writeInt(columns.size()); for (ColumnInfo c : columns) { - c.write(out); + c.writeTo(out); } - data.write(out); + data.writeTo(out); } @Override diff --git a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/QueryPageResponse.java b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/QueryPageResponse.java index bc43a0b6cb2..368366f24b5 100644 --- a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/QueryPageResponse.java +++ b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/QueryPageResponse.java @@ -27,13 +27,13 @@ public class QueryPageResponse extends AbstractQueryResponse { super(request, in); QueryPageRequest queryPageRequest = (QueryPageRequest) request; data = queryPageRequest.data(); - queryPageRequest.data().read(in); + queryPageRequest.data().readFrom(in); } @Override - public void write(int clientVersion, DataOutput out) throws IOException { - super.write(clientVersion, out); - data.write(out); + public void writeTo(int clientVersion, DataOutput out) throws IOException { + super.writeTo(clientVersion, out); + data.writeTo(out); } @Override diff --git a/sql/jdbc-proto/src/test/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/ColumnInfoTests.java b/sql/jdbc-proto/src/test/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/ColumnInfoTests.java index beaf9af219a..de7ea85e0ba 100644 --- a/sql/jdbc-proto/src/test/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/ColumnInfoTests.java +++ b/sql/jdbc-proto/src/test/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/ColumnInfoTests.java @@ -41,7 +41,7 @@ public class ColumnInfoTests extends ESTestCase { } public void testRoundTrip() throws IOException { - assertRoundTrip(randomColumnInfo(), ColumnInfo::write, ColumnInfo::new); + assertRoundTrip(randomColumnInfo(), ColumnInfo::writeTo, ColumnInfo::new); } public void testToString() { diff --git a/sql/jdbc-proto/src/test/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/MetaColumnInfoTests.java b/sql/jdbc-proto/src/test/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/MetaColumnInfoTests.java index a0990fb905a..04ba1a01199 100644 --- a/sql/jdbc-proto/src/test/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/MetaColumnInfoTests.java +++ b/sql/jdbc-proto/src/test/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/MetaColumnInfoTests.java @@ -19,7 +19,7 @@ public class MetaColumnInfoTests extends ESTestCase { } public void testRoundTrip() throws IOException { - assertRoundTrip(randomMetaColumnInfo(), MetaColumnInfo::write, MetaColumnInfo::new); + assertRoundTrip(randomMetaColumnInfo(), MetaColumnInfo::writeTo, MetaColumnInfo::new); } public void testToString() { diff --git a/sql/jdbc-proto/src/test/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/PageTests.java b/sql/jdbc-proto/src/test/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/PageTests.java index 3bbf253cb59..1a91ba21538 100644 --- a/sql/jdbc-proto/src/test/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/PageTests.java +++ b/sql/jdbc-proto/src/test/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/PageTests.java @@ -50,9 +50,9 @@ public class PageTests extends ESTestCase { public void testRoundTripNoReuse() throws IOException { Page example = randomPage(); - assertRoundTrip(example, Page::write, in -> { + assertRoundTrip(example, Page::writeTo, in -> { Page page = new Page(example.columnInfo()); - page.read(in); + page.readFrom(in); return page; }); } @@ -60,11 +60,11 @@ public class PageTests extends ESTestCase { public void testRoundTripReuse() throws IOException { Page example = randomPage(); Page target = new Page(example.columnInfo()); - roundTrip(example, Page::write, in -> {target.read(in); return null;}); + roundTrip(example, Page::writeTo, in -> {target.readFrom(in); return null;}); assertEquals(example, target); example = randomPageContents(example.columnInfo()); - roundTrip(example, Page::write, in -> {target.read(in); return null;}); + roundTrip(example, Page::writeTo, in -> {target.readFrom(in); return null;}); assertEquals(example, target); } diff --git a/sql/server/src/main/java/org/elasticsearch/xpack/sql/plugin/jdbc/RowSetPayload.java b/sql/server/src/main/java/org/elasticsearch/xpack/sql/plugin/jdbc/RowSetPayload.java index 8f0e5b181bf..087476718e4 100644 --- a/sql/server/src/main/java/org/elasticsearch/xpack/sql/plugin/jdbc/RowSetPayload.java +++ b/sql/server/src/main/java/org/elasticsearch/xpack/sql/plugin/jdbc/RowSetPayload.java @@ -25,12 +25,12 @@ public class RowSetPayload implements Payload { } @Override - public void read(DataInput in) throws IOException { + public void readFrom(DataInput in) throws IOException { throw new UnsupportedOperationException("This class can only be serialized"); } @Override - public void write(DataOutput out) throws IOException { + public void writeTo(DataOutput out) throws IOException { out.writeInt(rowSet.size()); List types = rowSet.schema().types(); diff --git a/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractErrorResponse.java b/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractErrorResponse.java index e2f5fa29842..434eb8eeeca 100644 --- a/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractErrorResponse.java +++ b/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractErrorResponse.java @@ -34,7 +34,7 @@ public abstract class AbstractErrorResponse extends Response { } @Override - protected final void write(int clientVersion, DataOutput out) throws IOException { + protected final void writeTo(int clientVersion, DataOutput out) throws IOException { out.writeUTF(message); out.writeUTF(cause); out.writeUTF(stack); diff --git a/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractExceptionResponse.java b/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractExceptionResponse.java index 732b038aea4..c86261fa1b7 100644 --- a/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractExceptionResponse.java +++ b/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractExceptionResponse.java @@ -49,10 +49,10 @@ public abstract class AbstractExceptionResponse extends Response { } @Override - protected final void write(int clientVersion, DataOutput out) throws IOException { + protected final void writeTo(int clientVersion, DataOutput out) throws IOException { out.writeUTF(message); out.writeUTF(cause); - exceptionType.write(out); + exceptionType.writeTo(out); } @Override diff --git a/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractInfoRequest.java b/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractInfoRequest.java index 78579986a98..1c25e10eb89 100644 --- a/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractInfoRequest.java +++ b/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractInfoRequest.java @@ -44,7 +44,7 @@ public abstract class AbstractInfoRequest extends Request { } @Override - public final void write(DataOutput out) throws IOException { + public final void writeTo(DataOutput out) throws IOException { out.writeUTF(jvmVersion); out.writeUTF(jvmVendor); out.writeUTF(jvmClassPath); diff --git a/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractInfoResponse.java b/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractInfoResponse.java index b21ed387b36..989470f3b87 100644 --- a/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractInfoResponse.java +++ b/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractInfoResponse.java @@ -40,7 +40,7 @@ public abstract class AbstractInfoResponse extends Response { } @Override - protected final void write(int clientVersion, DataOutput out) throws IOException { + protected final void writeTo(int clientVersion, DataOutput out) throws IOException { out.writeUTF(node); out.writeUTF(cluster); out.writeByte(majorVersion); diff --git a/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractProto.java b/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractProto.java index 416aa90d2b7..c57e3d68cc9 100644 --- a/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractProto.java +++ b/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractProto.java @@ -31,8 +31,8 @@ public abstract class AbstractProto { public void writeRequest(Request request, DataOutput out) throws IOException { writeHeader(CURRENT_VERSION, out); - request.requestType().write(out); - request.write(out); + request.requestType().writeTo(out); + request.writeTo(out); } public Request readRequest(DataInput in) throws IOException { @@ -45,8 +45,8 @@ public abstract class AbstractProto { public void writeResponse(Response response, int clientVersion, DataOutput out) throws IOException { writeHeader(clientVersion, out); - response.responseType().write(out); - response.write(clientVersion, out); + response.responseType().writeTo(out); + response.writeTo(clientVersion, out); } public Response readResponse(Request request, DataInput in) throws IOException { @@ -91,7 +91,7 @@ public abstract class AbstractProto { } } - public void write(DataOutput out) throws IOException { + public void writeTo(DataOutput out) throws IOException { out.writeByte(ordinal()); } @@ -110,7 +110,7 @@ public abstract class AbstractProto { Request read(int clientVersion, DataInput in) throws IOException; } protected interface RequestType { - void write(DataOutput out) throws IOException; + void writeTo(DataOutput out) throws IOException; RequestReader reader(); } @FunctionalInterface @@ -118,7 +118,7 @@ public abstract class AbstractProto { Response read(Request request, DataInput in) throws IOException; } protected interface ResponseType { - void write(DataOutput out) throws IOException; + void writeTo(DataOutput out) throws IOException; ResponseReader reader(); } diff --git a/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractQueryInitRequest.java b/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractQueryInitRequest.java index 35ad8999d85..f757be06d5b 100644 --- a/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractQueryInitRequest.java +++ b/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractQueryInitRequest.java @@ -37,11 +37,11 @@ public abstract class AbstractQueryInitRequest extends Request { } @Override - public void write(DataOutput out) throws IOException { + public void writeTo(DataOutput out) throws IOException { out.writeUTF(query); out.writeInt(fetchSize); out.writeUTF(timeZone.getID()); - timeout.write(out); + timeout.writeTo(out); } @Override diff --git a/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractQueryPageRequest.java b/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractQueryPageRequest.java index e6b12368fd4..ead37c9fbf1 100644 --- a/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractQueryPageRequest.java +++ b/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractQueryPageRequest.java @@ -34,10 +34,10 @@ public abstract class AbstractQueryPageRequest extends Request { } @Override - public void write(DataOutput out) throws IOException { + public void writeTo(DataOutput out) throws IOException { out.writeInt(cursor.length); out.write(cursor); - timeout.write(out); + timeout.writeTo(out); } @Override diff --git a/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractQueryResponse.java b/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractQueryResponse.java index 9b898832fdf..fda0e53c3ce 100644 --- a/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractQueryResponse.java +++ b/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractQueryResponse.java @@ -35,7 +35,7 @@ public abstract class AbstractQueryResponse extends Response { } @Override - protected void write(int clientVersion, DataOutput out) throws IOException { + protected void writeTo(int clientVersion, DataOutput out) throws IOException { out.writeLong(tookNanos); out.writeInt(cursor.length); out.write(cursor); diff --git a/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/Request.java b/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/Request.java index 7a1af23c806..a6ae7308393 100644 --- a/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/Request.java +++ b/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/Request.java @@ -20,7 +20,7 @@ public abstract class Request { * Write this request to the {@link DataOutput}. Implementers should * be kind and stick this right under the ctor that reads the response. */ - protected abstract void write(DataOutput out) throws IOException; + protected abstract void writeTo(DataOutput out) throws IOException; /** * Body to go into the {@link #toString()} result. diff --git a/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/Response.java b/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/Response.java index ca228e6b9fd..689091449d8 100644 --- a/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/Response.java +++ b/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/Response.java @@ -23,7 +23,7 @@ public abstract class Response { * the message. This should be used to send a response compatible * with the client. */ - protected abstract void write(int clientVersion, DataOutput out) throws IOException; + protected abstract void writeTo(int clientVersion, DataOutput out) throws IOException; /** * Body to go into the {@link #toString()} result. diff --git a/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/TimeoutInfo.java b/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/TimeoutInfo.java index 3004cd70332..20374f55642 100644 --- a/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/TimeoutInfo.java +++ b/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/TimeoutInfo.java @@ -25,7 +25,7 @@ public class TimeoutInfo { requestTimeout = in.readLong(); } - void write(DataOutput out) throws IOException { + void writeTo(DataOutput out) throws IOException { out.writeLong(clientTime); out.writeLong(timeout); out.writeLong(requestTimeout); diff --git a/sql/shared-proto/src/test/java/org/elasticsearch/xpack/sql/protocol/shared/TimeoutInfoTests.java b/sql/shared-proto/src/test/java/org/elasticsearch/xpack/sql/protocol/shared/TimeoutInfoTests.java index 85a6897b723..6e6fb3da044 100644 --- a/sql/shared-proto/src/test/java/org/elasticsearch/xpack/sql/protocol/shared/TimeoutInfoTests.java +++ b/sql/shared-proto/src/test/java/org/elasticsearch/xpack/sql/protocol/shared/TimeoutInfoTests.java @@ -17,6 +17,6 @@ public class TimeoutInfoTests extends ESTestCase { } public void testRoundTrip() throws IOException { - assertRoundTrip(randomTimeoutInfo(), TimeoutInfo::write, TimeoutInfo::new); + assertRoundTrip(randomTimeoutInfo(), TimeoutInfo::writeTo, TimeoutInfo::new); } }