Change

server/src/main/java/org/elasticsearch/http/HttpPreRequest.java

@@ -33,6 +33,19 @@ public interface HttpPreRequest {
      */
     String uri();
 
+    /**
+     * The uri without the query string.
+     */
+    default String path() {
+        String uri = uri();
+        final int index = uri.indexOf('?');
+        if (index >= 0) {
+            return uri.substring(0, index);
+        } else {
+            return uri;
+        }
+    }
+
     /**
      * Get all of the headers and values associated with the HTTP headers.
      * Modifications of this map are not supported.

server/src/main/java/org/elasticsearch/rest/RestRequest.java

@@ -204,7 +204,7 @@ void ensureSafeBuffers() {
      */
     public static RestRequest request(XContentParserConfiguration parserConfig, HttpRequest httpRequest, HttpChannel httpChannel) {
         Map<String, String> params = params(httpRequest.uri());
-        String path = path(httpRequest.uri());
+        String path = httpRequest.path();
         return new RestRequest(
             parserConfig,
             params,
@@ -229,15 +229,6 @@ private static Map<String, String> params(final String uri) {
         return params;
     }
 
-    private static String path(final String uri) {
-        final int index = uri.indexOf('?');
-        if (index >= 0) {
-            return uri.substring(0, index);
-        } else {
-            return uri;
-        }
-    }
-
     /**
      * Creates a new REST request. The path is not decoded so this constructor will not throw a
      * {@link BadParameterException}.