honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace (read|write)Shape with (read|write)NamedWriteable

This commit is contained in:
Nik Everett 2016-04-18 14:43:40 -04:00
parent d22603831d
commit d1722c9908
4 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilder.java
View File

@ -53,7 +53,7 @@ public class GeometryCollectionBuilder extends ShapeBuilder {
public GeometryCollectionBuilder(StreamInput in) throws IOException {
int shapes = in.readVInt();
for (int i = 0; i < shapes; i++) {
shape(in.readShape());
shape(in.readNamedWriteable(ShapeBuilder.class));
}
}
@ -61,7 +61,7 @@ public class GeometryCollectionBuilder extends ShapeBuilder {
public void writeTo(StreamOutput out) throws IOException {
out.writeVInt(shapes.size());
for (ShapeBuilder shape : shapes) {
out.writeShape(shape);
out.writeNamedWriteable(shape);
}
}

7
core/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java
View File

@ -746,13 +746,6 @@ public abstract class StreamInput extends InputStream {
return readNamedWriteable(QueryBuilder.class);
}
/**
* Reads a {@link ShapeBuilder} from the current stream
*/
public ShapeBuilder readShape() throws IOException {
return readNamedWriteable(ShapeBuilder.class);
}
/**
* Reads a {@link RescoreBuilder} from the current stream
*/

7
core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java
View File

@ -711,13 +711,6 @@ public abstract class StreamOutput extends OutputStream {
writeNamedWriteable(queryBuilder);
}
/**
* Writes a {@link ShapeBuilder} to the current stream
*/
public void writeShape(ShapeBuilder shapeBuilder) throws IOException {
writeNamedWriteable(shapeBuilder);
}
/**
* Writes a {@link ScoreFunctionBuilder} to the current stream
*/

4
core/src/main/java/org/elasticsearch/index/query/GeoShapeQueryBuilder.java
View File

@ -144,7 +144,7 @@ public class GeoShapeQueryBuilder extends AbstractQueryBuilder<GeoShapeQueryBuil
super(in);
fieldName = in.readString();
if (in.readBoolean()) {
shape = in.readShape();
shape = in.readNamedWriteable(ShapeBuilder.class);
indexedShapeId = null;
indexedShapeType = null;
} else {
@ -165,7 +165,7 @@ public class GeoShapeQueryBuilder extends AbstractQueryBuilder<GeoShapeQueryBuil
boolean hasShape = shape != null;
out.writeBoolean(hasShape);
if (hasShape) {
out.writeShape(shape);
out.writeNamedWriteable(shape);
} else {
out.writeOptionalString(indexedShapeId);
out.writeOptionalString(indexedShapeType);