Revert "Add querystring_search get method (#1616)"

This reverts commit c274e22.

docs/source/endpoints/querystringsearch.md

@@ -11,9 +11,7 @@ myst:
 
 The `@querystring-search` endpoint returns search results that can be filtered on search criteria.
 
-Call the `/@querystring-search` endpoint with either a `POST` or `GET` request.
-
-When using the `POST` request, provide a query in the request body:
+Call the `/@querystring-search` endpoint with a `POST` request and a query in the request body:
 
 ```{eval-rst}
 ..  http:example:: curl httpie python-requests
@@ -26,19 +24,6 @@ The server will respond with the results that are filtered based on the query yo
 :language: http
 ```
 
-When using the `GET` request, provide the query as a JSON URL-encoded string as a parameter.
-
-```{eval-rst}
-..  http:example:: curl httpie python-requests
-    :request: ../../../src/plone/restapi/tests/http-examples/querystringsearch_get.req
-```
-
-The server will respond with the results that are filtered based on the query you provided:
-
-```{literalinclude} ../../../src/plone/restapi/tests/http-examples/querystringsearch_get.resp
-:language: http
-```
-
 Parameters the endpoint will accept:
 
 - `query` - `plone.app.querystring` query, required
@@ -49,8 +34,10 @@ Parameters the endpoint will accept:
 - `limit` - integer, limits the number of returned results
 - `fullobjects` - boolean, if `true` then return the full objects instead of just the summary serialization
 
+
 ## Parameters
 
+
 ### Batch Start (`b_start`)
 
 The `b_start` parameter defines the first item of the batch:
@@ -71,6 +58,7 @@ The `b_start` parameter defines the first item of the batch:
 The `b_size` parameter is optional.
 The default value is `0`.
 
+
 ### Batch Size (b_size)
 
 The `b_size` parameter defines the number of elements a single batch returns:
@@ -91,6 +79,7 @@ The `b_size` parameter defines the number of elements a single batch returns:
 The parameter is optional.
 The default value is `25`.
 
+
 ### Sort on
 
 The `sort_on` parameter defines the field that is used to sort the returned search results:
@@ -111,6 +100,7 @@ The `sort_on` parameter defines the field that is used to sort the returned sear
 The `sort_on` parameter is optional.
 The default value is `None`.
 
+
 ### Sort Order
 
 The `sort_order` parameter defines the sort order when the `sort_on` field has been set:
@@ -136,6 +126,7 @@ The sort_order can be either `ascending` or `descending`.
 `ascending` means from A to Z for a text field.
 `reverse` is an alias equivalent to `descending`.
 
+
 ### Limit
 
 Querystring `query` with a `limit` parameter:
@@ -156,6 +147,7 @@ Querystring `query` with a `limit` parameter:
 The `limit` parameter is optional.
 The default value is `1000`.
 
+
 ### Query
 
 The `query` parameter is a list that contains an arbitrary number of `filters`:
@@ -184,8 +176,10 @@ The following types of filters are available:
 - Date filters
 - Text Filters
 
+
 #### Metadata Filters
 
+
 ##### Creator
 
 The `creator` of the content object.
@@ -218,6 +212,7 @@ You can either set the currently logged in user:
 }
 ```
 
+
 ##### Shortname
 
 `Shortname` is the ID of the object that is shown as the last part of the URL:
@@ -234,6 +229,7 @@ You can either set the currently logged in user:
 }
 ```
 
+
 ##### Location
 
 `Location` is the path of the content object on the site.
@@ -309,6 +305,7 @@ The path can contain a depth parameter that is separated with `::`:
 }
 ```
 
+
 ##### Type
 
 Filter by portal type:
@@ -325,6 +322,7 @@ Filter by portal type:
 }
 ```
 
+
 ##### Review State
 
 Filter results by review state:
@@ -341,6 +339,7 @@ Filter results by review state:
 }
 ```
 
+
 ##### Show Inactive
 
 Show inactive will return content objects that is expired for a given role:
@@ -357,8 +356,10 @@ Show inactive will return content objects that is expired for a given role:
 }
 ```
 
+
 #### Text Filters
 
+
 ##### Description
 
 Filter content that contains a term in the Description field:
@@ -375,6 +376,7 @@ Filter content that contains a term in the Description field:
 }
 ```
 
+
 ##### Searchable Text
 
 Filter content that contains a term in the SearchableText (all searchable fields in the catalog):
@@ -391,6 +393,7 @@ Filter content that contains a term in the SearchableText (all searchable fields
 }
 ```
 
+
 ##### Tag
 
 Filter by a tag (subjects field):
@@ -407,6 +410,7 @@ Filter by a tag (subjects field):
 }
 ```
 
+
 ##### Title
 
 Filter by exact Title match:
@@ -421,8 +425,10 @@ Filter by exact Title match:
 ]
 ```
 
+
 #### Date Filters
 
+
 ##### Creation Date
 
 Filter by creation date:
@@ -439,6 +445,7 @@ Filter by creation date:
 }
 ```
 
+
 ##### Effective Date
 
 Filter by effective date:
@@ -456,6 +463,7 @@ Filter by effective date:
 }
 ```
 
+
 ##### Event end date
 
 Filter by event end date:
@@ -472,6 +480,7 @@ Filter by event end date:
 }
 ```
 
+
 ##### Event start date
 
 Filter by event start date:
@@ -488,6 +497,7 @@ Filter by event start date:
 }
 ```
 
+
 ##### Expiration date
 
 Filter by expiration date:
@@ -505,6 +515,7 @@ Filter by expiration date:
 }
 ```
 
+
 ##### Modification date
 
 Filter by modification date:

src/plone/restapi/services/querystringsearch/configure.zcml

@@ -18,20 +18,4 @@
       permission="zope2.View"
       name="@querystring-search"
       />
-
-  <plone:service
-      method="GET"
-      factory=".get.QuerystringSearchGet"
-      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
-      permission="zope2.View"
-      name="@querystring-search"
-      />
-
-  <plone:service
-      method="GET"
-      factory=".get.QuerystringSearchGet"
-      for="Products.CMFCore.interfaces.IContentish"
-      permission="zope2.View"
-      name="@querystring-search"
-      />
 </configure>

src/plone/restapi/services/querystringsearch/get.py

@@ -4,11 +4,8 @@
 from plone.restapi.deserializer import json_body
 from plone.restapi.interfaces import ISerializeToJson
 from plone.restapi.services import Service
-from urllib import parse
 from zope.component import getMultiAdapter
 
-import json
-
 
 zcatalog_version = get_distribution("Products.ZCatalog").version
 if parse_version(zcatalog_version) >= parse_version("5.1"):
@@ -17,14 +14,11 @@
     SUPPORT_NOT_UUID_QUERIES = False
 
 
-class QuerystringSearch:
+class QuerystringSearchPost(Service):
     """Returns the querystring search results given a p.a.querystring data."""
 
-    def __init__(self, context, request):
-        self.context = context
-        self.request = request
-
-    def __call__(self, data):
+    def reply(self):
+        data = json_body(self.request)
         query = data.get("query", None)
         b_start = int(data.get("b_start", 0))
         b_size = int(data.get("b_size", 25))
@@ -66,21 +60,3 @@ def __call__(self, data):
             fullobjects=fullobjects
         )
         return results
-
-
-class QuerystringSearchPost(Service):
-    """Returns the querystring search results given a p.a.querystring data."""
-
-    def reply(self):
-        querystring_search = QuerystringSearch(self.context, self.request)
-        return querystring_search(data=json_body(self.request))
-
-
-class QuerystringSearchGet(Service):
-    """Returns the querystring search results given a p.a.querystring data."""
-
-    def reply(self):
-        querystring_search = QuerystringSearch(self.context, self.request)
-        return querystring_search(
-            data=json.loads(parse.unquote(self.request.form.get("query", "{}")))
-        )

src/plone/restapi/tests/test_documentation.py

@@ -1686,18 +1686,6 @@ def test_querystringsearch_post(self):
         )
         save_request_and_response_for_docs("querystringsearch_post", response)
 
-    def test_querystringsearch_get(self):
-        query = {
-            "query": "%7B%22query%22%3A%5B%7B%22i%22%3A%22portal_type%22%2C%22o%22%3A%20%22plone.app.querystring.operation.selection.any%22%2C%22v%22%3A%5B%22Document%22%5D%7D%5D%7D"
-        }
-        url = "/@querystring-search"
-
-        self.portal.invokeFactory("Document", "testdocument", title="Test Document")
-        transaction.commit()
-
-        response = self.api_session.get(url, params=query)
-        save_request_and_response_for_docs("querystringsearch_get", response)
-
     def test_system_get(self):
         response = self.api_session.get("/@system")
         save_request_for_docs("system_get", response)

src/plone/restapi/tests/test_services_querystringsearch.py

@@ -52,18 +52,6 @@ def test_querystringsearch_basic(self):
         self.assertEqual(len(response.json()["items"]), 1)
         self.assertNotIn("effective", response.json()["items"][0])
 
-    def test_querystringsearch_basic_get(self):
-        response = self.api_session.get(
-            "/@querystring-search?query=%7B%22query%22%3A%5B%7B%22i%22%3A%22portal_type%22%2C%22o%22%3A%20%22plone.app.querystring.operation.selection.any%22%2C%22v%22%3A%5B%22Document%22%5D%7D%5D%7D"
-        )
-
-        self.assertEqual(response.status_code, 200)
-        self.assertIn("items", response.json())
-        self.assertIn("items_total", response.json())
-        self.assertEqual(response.json()["items_total"], 1)
-        self.assertEqual(len(response.json()["items"]), 1)
-        self.assertNotIn("effective", response.json()["items"][0])
-
     def test_querystringsearch_fullobjects(self):
         response = self.api_session.post(
             "/@querystring-search",