Update for elastic#30966

tvernum · Jun 5, 2018 · 8098b96 · 8098b96
1 parent 63512f1
commit 8098b96
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 27 deletions.
diff --git a/...n/java/org/elasticsearch/xpack/core/security/action/privilege/DeletePrivilegesAction.java b/...n/java/org/elasticsearch/xpack/core/security/action/privilege/DeletePrivilegesAction.java
@@ -11,8 +11,7 @@
 /**
  * Action for deleting application privileges.
  */
-public final class DeletePrivilegesAction
-    extends Action<DeletePrivilegesRequest, DeletePrivilegesResponse, DeletePrivilegesRequestBuilder> {
+public final class DeletePrivilegesAction extends Action<DeletePrivilegesRequest, DeletePrivilegesResponse> {
 
     public static final DeletePrivilegesAction INSTANCE = new DeletePrivilegesAction();
     public static final String NAME = "cluster:admin/xpack/security/privilege/delete";
@@ -21,11 +20,6 @@ private DeletePrivilegesAction() {
         super(NAME);
     }
 
-    @Override
-    public DeletePrivilegesRequestBuilder newRequestBuilder(ElasticsearchClient client) {
-        return new DeletePrivilegesRequestBuilder(client, this);
-    }
-
     @Override
     public DeletePrivilegesResponse newResponse() {
         return new DeletePrivilegesResponse();

diff --git a/...rg/elasticsearch/xpack/core/security/action/privilege/DeletePrivilegesRequestBuilder.java b/...rg/elasticsearch/xpack/core/security/action/privilege/DeletePrivilegesRequestBuilder.java
@@ -14,8 +14,7 @@
 /**
  * Builder for {@link DeletePrivilegesRequest}
  */
-public final class DeletePrivilegesRequestBuilder
-        extends ActionRequestBuilder<DeletePrivilegesRequest, DeletePrivilegesResponse, DeletePrivilegesRequestBuilder>
+public final class DeletePrivilegesRequestBuilder     extends ActionRequestBuilder<DeletePrivilegesRequest, DeletePrivilegesResponse>
         implements WriteRequestBuilder<DeletePrivilegesRequestBuilder> {
 
     public DeletePrivilegesRequestBuilder(ElasticsearchClient client, DeletePrivilegesAction action) {

diff --git a/...main/java/org/elasticsearch/xpack/core/security/action/privilege/GetPrivilegesAction.java b/...main/java/org/elasticsearch/xpack/core/security/action/privilege/GetPrivilegesAction.java
@@ -11,7 +11,7 @@
 /**
  * Action for retrieving one or more application privileges from the security index
  */
-public final class GetPrivilegesAction extends Action<GetPrivilegesRequest, GetPrivilegesResponse, GetPrivilegesRequestBuilder> {
+public final class GetPrivilegesAction extends Action<GetPrivilegesRequest, GetPrivilegesResponse> {
 
     public static final GetPrivilegesAction INSTANCE = new GetPrivilegesAction();
     public static final String NAME = "cluster:admin/xpack/security/privilege/get";
@@ -20,11 +20,6 @@ private GetPrivilegesAction() {
         super(NAME);
     }
 
-    @Override
-    public GetPrivilegesRequestBuilder newRequestBuilder(ElasticsearchClient client) {
-        return new GetPrivilegesRequestBuilder(client, this);
-    }
-
     @Override
     public GetPrivilegesResponse newResponse() {
         return new GetPrivilegesResponse();

diff --git a/...a/org/elasticsearch/xpack/core/security/action/privilege/GetPrivilegesRequestBuilder.java b/...a/org/elasticsearch/xpack/core/security/action/privilege/GetPrivilegesRequestBuilder.java
@@ -11,8 +11,7 @@
 /**
  * Builder for {@link GetPrivilegesRequest}
  */
-public final class GetPrivilegesRequestBuilder
-    extends ActionRequestBuilder<GetPrivilegesRequest, GetPrivilegesResponse, GetPrivilegesRequestBuilder> {
+public final class GetPrivilegesRequestBuilder extends ActionRequestBuilder<GetPrivilegesRequest, GetPrivilegesResponse> {
 
     public GetPrivilegesRequestBuilder(ElasticsearchClient client, GetPrivilegesAction action) {
         super(client, action, new GetPrivilegesRequest());

diff --git a/...main/java/org/elasticsearch/xpack/core/security/action/privilege/PutPrivilegesAction.java b/...main/java/org/elasticsearch/xpack/core/security/action/privilege/PutPrivilegesAction.java
@@ -11,7 +11,7 @@
 /**
  * Action for putting (adding/updating) one or more application privileges.
  */
-public final class PutPrivilegesAction extends Action<PutPrivilegesRequest, PutPrivilegesResponse, PutPrivilegesRequestBuilder> {
+public final class PutPrivilegesAction extends Action<PutPrivilegesRequest, PutPrivilegesResponse> {
 
     public static final PutPrivilegesAction INSTANCE = new PutPrivilegesAction();
     public static final String NAME = "cluster:admin/xpack/security/privilege/put";
@@ -20,11 +20,6 @@ private PutPrivilegesAction() {
         super(NAME);
     }
 
-    @Override
-    public PutPrivilegesRequestBuilder newRequestBuilder(ElasticsearchClient client) {
-        return new PutPrivilegesRequestBuilder(client, this);
-    }
-
     @Override
     public PutPrivilegesResponse newResponse() {
         return new PutPrivilegesResponse();

diff --git a/...a/org/elasticsearch/xpack/core/security/action/privilege/PutPrivilegesRequestBuilder.java b/...a/org/elasticsearch/xpack/core/security/action/privilege/PutPrivilegesRequestBuilder.java
@@ -27,8 +27,7 @@
 /**
  * Request builder for {@link PutPrivilegesRequest}
  */
-public final class PutPrivilegesRequestBuilder
-    extends ActionRequestBuilder<PutPrivilegesRequest, PutPrivilegesResponse, PutPrivilegesRequestBuilder>
+public final class PutPrivilegesRequestBuilder extends ActionRequestBuilder<PutPrivilegesRequest, PutPrivilegesResponse>
     implements WriteRequestBuilder<PutPrivilegesRequestBuilder> {
 
     public PutPrivilegesRequestBuilder(ElasticsearchClient client, PutPrivilegesAction action) {

diff --git a/...src/test/java/org/elasticsearch/xpack/security/authz/store/NativePrivilegeStoreTests.java b/...src/test/java/org/elasticsearch/xpack/security/authz/store/NativePrivilegeStoreTests.java
@@ -83,8 +83,8 @@ public void setup() {
         client = new NoOpClient(getTestName()) {
             @Override
             protected <Request extends ActionRequest, Response extends ActionResponse,
-                RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>>
-            void doExecute(Action<Request, Response, RequestBuilder> action, Request request, ActionListener<Response> listener) {
+                RequestBuilder extends ActionRequestBuilder<Request, Response>>
+            void doExecute(Action<Request, Response> action, Request request, ActionListener<Response> listener) {
                 NativePrivilegeStoreTests.this.requests.add(request);
                 NativePrivilegeStoreTests.this.listener.set(listener);
             }