diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java index cbe5516bc..131c12763 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java @@ -97,12 +97,13 @@ public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub { Map> fields = new HashMap<>(); ProtoRestSerializer serializer = ProtoRestSerializer.create(); + serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int"); return fields; }) .setRequestBodyExtractor( request -> ProtoRestSerializer.create() - .toBody("*", request.toBuilder().clearProjectId().build(), false)) + .toBody("*", request.toBuilder().clearProjectId().build(), true)) .build()) .setResponseParser( ProtoMessageResponseParser.newBuilder() @@ -136,12 +137,13 @@ public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub { Map> fields = new HashMap<>(); ProtoRestSerializer serializer = ProtoRestSerializer.create(); + serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int"); return fields; }) .setRequestBodyExtractor( request -> ProtoRestSerializer.create() - .toBody("*", request.toBuilder().clearProjectId().build(), false)) + .toBody("*", request.toBuilder().clearProjectId().build(), true)) .build()) .setResponseParser( ProtoMessageResponseParser.newBuilder() @@ -175,12 +177,13 @@ public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub { Map> fields = new HashMap<>(); ProtoRestSerializer serializer = ProtoRestSerializer.create(); + serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int"); return fields; }) .setRequestBodyExtractor( request -> ProtoRestSerializer.create() - .toBody("index", request.getIndex(), false)) + .toBody("index", request.getIndex(), true)) .build()) .setResponseParser( ProtoMessageResponseParser.newBuilder() @@ -215,6 +218,7 @@ public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub { Map> fields = new HashMap<>(); ProtoRestSerializer serializer = ProtoRestSerializer.create(); + serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int"); return fields; }) .setRequestBodyExtractor(request -> null) @@ -251,6 +255,7 @@ public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub { Map> fields = new HashMap<>(); ProtoRestSerializer serializer = ProtoRestSerializer.create(); + serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int"); return fields; }) .setRequestBodyExtractor(request -> null) @@ -287,6 +292,7 @@ public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub { serializer.putQueryParam(fields, "filter", request.getFilter()); serializer.putQueryParam(fields, "pageSize", request.getPageSize()); serializer.putQueryParam(fields, "pageToken", request.getPageToken()); + serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int"); return fields; }) .setRequestBodyExtractor(request -> null)