Updated SearchApi and respective tests and docs, regenerated the client

Author: Nick-S-2018

README.md

@@ -5,7 +5,7 @@ Manticore Search Client
 
 - API version: 3.3.0
 
-- Build date: 2023-04-21T16:12:17.895346Z[Etc/UTC]
+- Build date: 2023-05-28T11:55:17.809597Z[Etc/UTC]
 
 Сlient for Manticore Search.
 

docs/GeoDistanceFilterLocationAnchor.md

@@ -8,8 +8,8 @@ Geo pin point object
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**lat** | **Integer** | Geo latitude of pin point in degrees |  [optional] |
-|**lon** | **Integer** | Geo longitude pf pin point in degrees |  [optional] |
+|**lat** | **BigDecimal** | Geo latitude of pin point in degrees |  [optional] |
+|**lon** | **BigDecimal** | Geo longitude pf pin point in degrees |  [optional] |
 
 
 

docs/SearchApi.md

@@ -13,12 +13,10 @@ Method | HTTP request | Description
 
 Performs a search on an index. 
 
-The method expects an object with the following mandatory properties:
+The method expects a SearchRequest object with the following mandatory properties:
 
-* the name of the index to search
+* the name of the index to search | string
 
-* the match query object
-
 For details, see the documentation on [**SearchRequest**](SearchRequest.md)
 
 The method returns an object with the following properties:
@@ -59,18 +57,17 @@ Here is an example search response:
 }
 ```
 
-For more information about the match query syntax, additional paramaters that can be set to request and response, please check: https://manual.manticoresearch.com/Searching/Full_text_matching/Basic_usage#HTTP-JSON.
+For more information about the match query syntax, additional parameters that can be set to request and response, please check: https://manual.manticoresearch.com/Searching/Full_text_matching/Basic_usage#HTTP-JSON.
 
 
 ### Example
 ```java
 
+import java.util.*;
 import com.manticoresearch.client.ApiClient;
 import com.manticoresearch.client.ApiException;
 import com.manticoresearch.client.Configuration;
 import com.manticoresearch.client.model.*;
-import com.manticoresearch.client.api.IndexApi;
-import com.manticoresearch.client.api.UtilsApi;
 import com.manticoresearch.client.api.SearchApi;
 
 public class SearchApiExample {
@@ -122,10 +119,10 @@ No authorization required
 - **Accept**: application/json
 
 ### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Ok |  -  |
-| **0** | error |  -  |
+| Status code | Description |
+|-------------|-------------|
+| **200** | Success, query processed |
+| **500** | Server error |
 
 
 ## percolate
@@ -134,14 +131,14 @@ No authorization required
 
 Perform a reverse search on a percolate index
 
-Performs a percolate search. 
 This method must be used only on percolate indexes.
 
-Expects two parameters: the index name and an object with an array of documents to be tested.
-An example of the documents object:
+Expects two parameters: the index name and an object with a document or an array of documents to search by.
+Here is an example of the object with a single document:
 
 ```
-{"query":
+{
+  "query":
   {
     "percolate":
     {
@@ -193,17 +190,38 @@ Responds with an object with matched stored queries:
 }
 ```
 
+And here is an example of the object with multiple documents:
+
+```
+{
+  "query":
+  {
+    "percolate":
+    {
+      "documents": [
+        {
+          "content":"sample content"
+        },
+        {
+          "content":"another sample content"
+        }
+      ]
+    }
+  }
+}
+```
+
 
 ### Example
 
 ```java
 // Import classes:
+import java.util.*;
 import com.manticoresearch.client.ApiClient;
 import com.manticoresearch.client.ApiException;
 import com.manticoresearch.client.Configuration;
 import com.manticoresearch.client.model.*;
 import com.manticoresearch.client.api.SearchApi;
-import java.math.BigDecimal;
 
 public class Example {
     public static void main(String[] args) {
@@ -214,15 +232,15 @@ public class Example {
 
         try {
             PercolateRequest percolateRequest = new PercolateRequest();
-            query = new HashMap<String,Object>(){{
+            Map<String,Object> query = new HashMap<String,Object>(){{
                 put("percolate",new HashMap<String,Object >(){{
                     put("document", new HashMap<String,Object >(){{ 
                         put("title","what a nice bag");
                     }});
                 }});
             }};
             percolateRequest.query(query);
-            Object result =    searchApi.percolate("products",percolateRequest);
+            Object result =  searchApi.percolate("products",percolateRequest);
         } catch (ApiException e) {
             System.err.println("Exception when calling SearchApi#percolate");
             System.err.println("Status code: " + e.getCode());
@@ -256,8 +274,8 @@ No authorization required
 - **Accept**: application/json
 
 ### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | items found |  -  |
-| **0** | error |  -  |
+| Status code | Description |
+|-------------|-------------|
+| **200** | Success, query processed |
+| **500** | Server error |
 

docs/SearchRequest.md

@@ -16,7 +16,6 @@ Request object for search operation
 |**offset** | **Integer** |  |  [optional] |
 |**maxMatches** | **Integer** |  |  [optional] |
 |**sort** | **List<Object>** |  |  [optional] |
-|**sortOld** | **List<Object>** |  |  [optional] |
 |**aggs** | [**List<Aggregation>**](Aggregation.md) |  |  [optional] |
 |**expressions** | **List<Object>** |  |  [optional] |
 |**highlight** | [**Highlight**](Highlight.md) |  |  [optional] |

src/main/java/com/manticoresearch/client/ApiClient.java

@@ -1,6 +1,8 @@
 package com.manticoresearch.client;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import org.openapitools.jackson.nullable.JsonNullableModule;
 
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
@@ -74,7 +76,7 @@
 /**
  * <p>ApiClient class.</p>
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-21T16:12:17.895346Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-05-28T11:55:17.809597Z[Etc/UTC]")
 public class ApiClient extends JavaTimeFormatter {
   private static final Pattern JSON_MIME_PATTERN = Pattern.compile("(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$");
 
@@ -784,12 +786,15 @@ public Entity<?> serialize(Object obj, Map<String, Object> formParams, String co
           entity = Entity.entity(obj == null ? "null" : obj, contentType);
         }
       } else {
-           if (obj instanceof SearchRequest) {
-        	ObjectMapper oMapper = new ObjectMapper();
-        	Map<String, Object> map = oMapper.convertValue(obj, Map.class);
-			entity = Entity.entity(map, contentType);
+        if (obj instanceof SearchRequest) {
+           ObjectMapper oMapper = new ObjectMapper();
+           oMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+           oMapper.registerModule(new JsonNullableModule());
+
+           Map<String, Object> map = oMapper.convertValue(obj, Map.class);
+           entity = Entity.entity(map, contentType);
 
-			class SearchRequestRestruct {
+           class SearchRequestRestruct {
 				public Map<String, Object> restructObj(Map<String, Object> obj, String objType)
 	 			{
 	 			    if (!obj.containsKey("attr") && !obj.containsKey("name") && !obj.containsKey("query_fields") && !obj.containsKey("value") && !obj.containsKey("values")
@@ -902,7 +907,7 @@ public Map<String, Object> restructNestedObj(List<Object> nestedObj, List<String
 
 	                return (Map<String, Object>) nestedObj.get(0);
 	            }
-        	};
+            };
 
 			SearchRequestRestruct restruct = new SearchRequestRestruct();
 
@@ -922,7 +927,7 @@ public Map<String, Object> restructNestedObj(List<Object> nestedObj, List<String
 	 		        } 
 	 		    }
 	 		    map.put("sort", restrSortList);
-	 		}
+            }
 
 	 		Boolean hasFilterSet = (map.containsKey("fulltext_filter") && map.get("fulltext_filter") != null) ||
 	 			(map.containsKey("attr_filter") && map.get("attr_filter") != null);

src/main/java/com/manticoresearch/client/ApiException.java

@@ -19,7 +19,7 @@
 /**
  * API Exception
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-21T16:12:17.895346Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-05-28T11:55:17.809597Z[Etc/UTC]")
 public class ApiException extends Exception {
     private int code = 0;
     private Map<String, List<String>> responseHeaders = null;

src/main/java/com/manticoresearch/client/Configuration.java

@@ -13,7 +13,7 @@
 
 package com.manticoresearch.client;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-21T16:12:17.895346Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-05-28T11:55:17.809597Z[Etc/UTC]")
 public class Configuration {
     private static ApiClient defaultApiClient = new ApiClient();
 

src/main/java/com/manticoresearch/client/JSON.java

@@ -15,7 +15,7 @@
 import javax.ws.rs.core.GenericType;
 import javax.ws.rs.ext.ContextResolver;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-21T16:12:17.895346Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-05-28T11:55:17.809597Z[Etc/UTC]")
 public class JSON implements ContextResolver<ObjectMapper> {
   private ObjectMapper mapper;
 

src/main/java/com/manticoresearch/client/JavaTimeFormatter.java

@@ -20,7 +20,7 @@
  * Class that add parsing/formatting support for Java 8+ {@code OffsetDateTime} class.
  * It's generated for java clients when {@code AbstractJavaCodegen#dateLibrary} specified as {@code java8}.
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-21T16:12:17.895346Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-05-28T11:55:17.809597Z[Etc/UTC]")
 public class JavaTimeFormatter {
 
     private DateTimeFormatter offsetDateTimeFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME;

src/main/java/com/manticoresearch/client/Pair.java

@@ -13,7 +13,7 @@
 
 package com.manticoresearch.client;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-21T16:12:17.895346Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-05-28T11:55:17.809597Z[Etc/UTC]")
 public class Pair {
     private String name = "";
     private String value = "";