Move into hlrc and fix comment

Author: hub-cap

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

@@ -66,8 +66,6 @@
 import org.elasticsearch.index.rankeval.RankEvalRequest;
 import org.elasticsearch.index.rankeval.RankEvalResponse;
 import org.elasticsearch.plugins.spi.NamedXContentProvider;
-import org.elasticsearch.protocol.xpack.common.Validatable;
-import org.elasticsearch.protocol.xpack.common.ValidationException;
 import org.elasticsearch.rest.BytesRestResponse;
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.script.mustache.MultiSearchTemplateRequest;
@@ -953,8 +951,7 @@ public final void fieldCapsAsync(FieldCapabilitiesRequest fieldCapabilitiesReque
 
     /**
      * @deprecated If creating a new HLRC ReST API call, consider creating new actions instead of reusing server actions. The Validation
-     * layer has been added to the ReST client, and requests should extend
-     * {@link org.elasticsearch.protocol.xpack.common.ValidationException} instead of `ActionRequest`.
+     * layer has been added to the ReST client, and requests should extend {@link Validatable} instead of `ActionRequest`.
      */
     @Deprecated
     protected final <Req extends ActionRequest, Resp> Resp performRequestAndParseEntity(Req request,
@@ -980,8 +977,7 @@ protected final <Req extends Validatable, Resp> Resp performRequestAndParseEntit
 
     /**
      * @deprecated If creating a new HLRC ReST API call, consider creating new actions instead of reusing server actions. The Validation
-     * layer has been added to the ReST client, and requests should extend
-     * {@link org.elasticsearch.protocol.xpack.common.ValidationException} instead of `ActionRequest`.
+     * layer has been added to the ReST client, and requests should extend {@link Validatable} instead of `ActionRequest`.
      */
     @Deprecated
     protected final <Req extends ActionRequest, Resp> Resp performRequest(Req request,
@@ -1048,8 +1044,7 @@ private <Req, Resp> Resp internalPerformRequest(Req request,
 
     /**
      * @deprecated If creating a new HLRC ReST API call, consider creating new actions instead of reusing server actions. The Validation
-     * layer has been added to the ReST client, and requests should extend
-     * {@link org.elasticsearch.protocol.xpack.common.ValidationException} instead of `ActionRequest`.
+     * layer has been added to the ReST client, and requests should extend {@link Validatable} instead of `ActionRequest`.
      */
     @Deprecated
     protected final <Req extends ActionRequest, Resp> void performRequestAsyncAndParseEntity(Req request,
@@ -1076,8 +1071,7 @@ protected final <Req extends Validatable, Resp> void performRequestAsyncAndParse
 
     /**
      * @deprecated If creating a new HLRC ReST API call, consider creating new actions instead of reusing server actions. The Validation
-     * layer has been added to the ReST client, and requests should extend
-     * {@link org.elasticsearch.protocol.xpack.common.ValidationException} instead of `ActionRequest`.
+     * layer has been added to the ReST client, and requests should extend {@link Validatable} instead of `ActionRequest`.
      */
     @Deprecated
     protected final <Req extends ActionRequest, Resp> void performRequestAsync(Req request,

x-pack/protocol/src/main/java/org/elasticsearch/protocol/xpack/common/Validatable.java renamed to client/rest-high-level/src/main/java/org/elasticsearch/client/Validatable.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.protocol.xpack.common;
+package org.elasticsearch.client;
 
 /**
  * Defines a validation layer for Requests.

x-pack/protocol/src/main/java/org/elasticsearch/protocol/xpack/common/ValidationException.java renamed to client/rest-high-level/src/main/java/org/elasticsearch/client/ValidationException.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.protocol.xpack.common;
+package org.elasticsearch.client;
 
 import java.util.ArrayList;
 import java.util.List;