adjust to no longer rely on rest api compatiblity

Author: jakelandis

x-pack/plugin/core/src/main/java/org/elasticsearch/license/RestGetLicenseAction.java

@@ -27,7 +27,6 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.elasticsearch.core.RestApiVersion.V_8;
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 import static org.elasticsearch.rest.RestStatus.NOT_FOUND;
 import static org.elasticsearch.rest.RestStatus.OK;
@@ -62,17 +61,17 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
         overrideParams.put(License.REST_VIEW_MODE, "true");
         overrideParams.put(License.LICENSE_VERSION_MODE, String.valueOf(License.VERSION_CURRENT));
 
-        // In 7.x, there was an opt-in flag to show "enterprise" licenses. In 8.0 the flag is deprecated and can only be true
-        if (request.getRestApiVersion() == V_8 && request.hasParam("accept_enterprise")) {
+        // In 7.x, there was an opt-in flag to show "enterprise" licenses. In 8.0+ the flag is deprecated and can only be true
+        if (request.hasParam("accept_enterprise")) {
             deprecationLogger.warn(
-                DeprecationCategory.COMPATIBLE_API,
+                DeprecationCategory.API,
                 "get_license_accept_enterprise",
                 "Including [accept_enterprise] in get license requests is deprecated."
                     + " The parameter will be removed in the next major version"
             );
-            if (request.paramAsBoolean("accept_enterprise", true) == false) { // consumes the parameter to avoid error
-                throw new IllegalArgumentException("The [accept_enterprise] parameters may not be false");
-            }
+        }
+        if (request.paramAsBoolean("accept_enterprise", true) == false) { // consumes the parameter to avoid error
+            throw new IllegalArgumentException("The [accept_enterprise] parameters may not be false");
         }
 
         final ToXContent.Params params = new ToXContent.DelegatingMapParams(overrideParams, request);

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rest/action/RestXPackInfoAction.java

@@ -22,7 +22,6 @@
 import java.util.EnumSet;
 import java.util.List;
 
-import static org.elasticsearch.core.RestApiVersion.V_8;
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 import static org.elasticsearch.rest.RestRequest.Method.HEAD;
 
@@ -49,16 +48,16 @@ public RestChannelConsumer prepareRequest(RestRequest request, NodeClient client
         boolean verbose = request.paramAsBoolean("human", true);
 
         // In 7.x, there was an opt-in flag to show "enterprise" licenses. In 8.0 the flag is deprecated and can only be true
-        if (request.getRestApiVersion() == V_8 && request.hasParam("accept_enterprise")) {
+        if (request.hasParam("accept_enterprise")) {
             deprecationLogger.warn(
-                DeprecationCategory.COMPATIBLE_API,
+                DeprecationCategory.API,
                 "get_license_accept_enterprise",
                 "Including [accept_enterprise] in get license requests is deprecated."
                     + " The parameter will be removed in the next major version"
             );
-            if (request.paramAsBoolean("accept_enterprise", true) == false) { // consumes the parameter to avoid error
-                throw new IllegalArgumentException("The [accept_enterprise] parameters may not be false");
-            }
+        }
+        if (request.paramAsBoolean("accept_enterprise", true) == false) { // consumes the parameter to avoid error
+            throw new IllegalArgumentException("The [accept_enterprise] parameters may not be false");
         }
 
         EnumSet<XPackInfoRequest.Category> categories = XPackInfoRequest.Category.toSet(