[TEST] Remove token methods from HLRC SecurityClient

client/rest-high-level/src/main/java/org/elasticsearch/client/SecurityClient.java

@@ -10,21 +10,16 @@
 
 import org.elasticsearch.client.security.ClearRealmCacheRequest;
 import org.elasticsearch.client.security.ClearRealmCacheResponse;
-import org.elasticsearch.client.security.CreateTokenRequest;
-import org.elasticsearch.client.security.CreateTokenResponse;
 import org.elasticsearch.client.security.DelegatePkiAuthenticationRequest;
 import org.elasticsearch.client.security.DelegatePkiAuthenticationResponse;
 import org.elasticsearch.client.security.GetApiKeyRequest;
 import org.elasticsearch.client.security.GetApiKeyResponse;
 import org.elasticsearch.client.security.InvalidateApiKeyRequest;
 import org.elasticsearch.client.security.InvalidateApiKeyResponse;
-import org.elasticsearch.client.security.InvalidateTokenRequest;
-import org.elasticsearch.client.security.InvalidateTokenResponse;
 
 import java.io.IOException;
 
 import static java.util.Collections.emptySet;
-import static java.util.Collections.singleton;
 
 /**
  * A wrapper for the {@link RestHighLevelClient} that provides methods for accessing the Security APIs.
@@ -65,46 +60,6 @@ public ClearRealmCacheResponse clearRealmCache(ClearRealmCacheRequest request, R
         );
     }
 
-    /**
-     * Creates an OAuth2 token.
-     * See <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-token.html">
-     * the docs</a> for more.
-     *
-     * @param request the request for the token
-     * @param options the request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
-     * @return the response from the create token call
-     * @throws IOException in case there is a problem sending the request or parsing back the response
-     */
-    public CreateTokenResponse createToken(CreateTokenRequest request, RequestOptions options) throws IOException {
-        return restHighLevelClient.performRequestAndParseEntity(
-            request,
-            SecurityRequestConverters::createToken,
-            options,
-            CreateTokenResponse::fromXContent,
-            emptySet()
-        );
-    }
-
-    /**
-     * Invalidates an OAuth2 token.
-     * See <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-invalidate-token.html">
-     * the docs</a> for more.
-     *
-     * @param request the request to invalidate the token
-     * @param options the request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
-     * @return the response from the create token call
-     * @throws IOException in case there is a problem sending the request or parsing back the response
-     */
-    public InvalidateTokenResponse invalidateToken(InvalidateTokenRequest request, RequestOptions options) throws IOException {
-        return restHighLevelClient.performRequestAndParseEntity(
-            request,
-            SecurityRequestConverters::invalidateToken,
-            options,
-            InvalidateTokenResponse::fromXContent,
-            singleton(404)
-        );
-    }
-
     /**
      * Retrieve API Key(s) information.<br>
      * See <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-api-key.html">

client/rest-high-level/src/main/java/org/elasticsearch/client/SecurityRequestConverters.java

@@ -12,11 +12,9 @@
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.elasticsearch.client.security.ClearRealmCacheRequest;
-import org.elasticsearch.client.security.CreateTokenRequest;
 import org.elasticsearch.client.security.DelegatePkiAuthenticationRequest;
 import org.elasticsearch.client.security.GetApiKeyRequest;
 import org.elasticsearch.client.security.InvalidateApiKeyRequest;
-import org.elasticsearch.client.security.InvalidateTokenRequest;
 import org.elasticsearch.common.Strings;
 
 import java.io.IOException;
@@ -45,24 +43,12 @@ static Request clearRealmCache(ClearRealmCacheRequest clearRealmCacheRequest) {
         return request;
     }
 
-    static Request createToken(CreateTokenRequest createTokenRequest) throws IOException {
-        Request request = new Request(HttpPost.METHOD_NAME, "/_security/oauth2/token");
-        request.setEntity(createEntity(createTokenRequest, REQUEST_BODY_CONTENT_TYPE));
-        return request;
-    }
-
     static Request delegatePkiAuthentication(DelegatePkiAuthenticationRequest delegatePkiAuthenticationRequest) throws IOException {
         Request request = new Request(HttpPost.METHOD_NAME, "/_security/delegate_pki");
         request.setEntity(createEntity(delegatePkiAuthenticationRequest, REQUEST_BODY_CONTENT_TYPE));
         return request;
     }
 
-    static Request invalidateToken(InvalidateTokenRequest invalidateTokenRequest) throws IOException {
-        Request request = new Request(HttpDelete.METHOD_NAME, "/_security/oauth2/token");
-        request.setEntity(createEntity(invalidateTokenRequest, REQUEST_BODY_CONTENT_TYPE));
-        return request;
-    }
-
     static Request getApiKey(final GetApiKeyRequest getApiKeyRequest) throws IOException {
         final Request request = new Request(HttpGet.METHOD_NAME, "/_security/api_key");
         if (Strings.hasText(getApiKeyRequest.getId())) {