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

Stream version nit after ff0f540 and ce60585

This commit is contained in:
Albert Zaharovits 2019-01-21 13:45:46 +02:00
parent 468bae29f7
commit 0631322dda
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/GetUserPrivilegesResponse.java
View File

@ -145,7 +145,7 @@ public final class GetUserPrivilegesResponse extends ActionResponse {
return new FieldPermissionsDefinition.FieldGrantExcludeGroup(grant, exclude); return new FieldPermissionsDefinition.FieldGrantExcludeGroup(grant, exclude);
})); }));
queries = Collections.unmodifiableSet(in.readSet(StreamInput::readBytesReference)); queries = Collections.unmodifiableSet(in.readSet(StreamInput::readBytesReference));
if (in.getVersion().onOrAfter(Version.V_7_0_0)) { if (in.getVersion().onOrAfter(Version.V_6_7_0)) {
this.allowRestrictedIndices = in.readBoolean(); this.allowRestrictedIndices = in.readBoolean();
} else { } else {
this.allowRestrictedIndices = false; this.allowRestrictedIndices = false;
@ -254,7 +254,7 @@ public final class GetUserPrivilegesResponse extends ActionResponse {
output.writeOptionalStringArray(fields.getExcludedFields()); output.writeOptionalStringArray(fields.getExcludedFields());
}); });
out.writeCollection(queries, StreamOutput::writeBytesReference); out.writeCollection(queries, StreamOutput::writeBytesReference);
if (out.getVersion().onOrAfter(Version.V_7_0_0)) { if (out.getVersion().onOrAfter(Version.V_6_7_0)) {
out.writeBoolean(allowRestrictedIndices); out.writeBoolean(allowRestrictedIndices);
} }
} }

4
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/RoleDescriptor.java
View File

@ -613,7 +613,7 @@ public class RoleDescriptor implements ToXContentObject {
this.deniedFields = in.readOptionalStringArray(); this.deniedFields = in.readOptionalStringArray();
this.privileges = in.readStringArray(); this.privileges = in.readStringArray();
this.query = in.readOptionalBytesReference(); this.query = in.readOptionalBytesReference();
if (in.getVersion().onOrAfter(Version.V_7_0_0)) { if (in.getVersion().onOrAfter(Version.V_6_7_0)) {
allowRestrictedIndices = in.readBoolean(); allowRestrictedIndices = in.readBoolean();
} else { } else {
allowRestrictedIndices = false; allowRestrictedIndices = false;
@ -627,7 +627,7 @@ public class RoleDescriptor implements ToXContentObject {
out.writeOptionalStringArray(deniedFields); out.writeOptionalStringArray(deniedFields);
out.writeStringArray(privileges); out.writeStringArray(privileges);
out.writeOptionalBytesReference(query); out.writeOptionalBytesReference(query);
if (out.getVersion().onOrAfter(Version.V_7_0_0)) { if (out.getVersion().onOrAfter(Version.V_6_7_0)) {
out.writeBoolean(allowRestrictedIndices); out.writeBoolean(allowRestrictedIndices);
} }
} }