Merge branch 'main' into fix/api-typos

Author: gazconroy

clients/algoliasearch-client-ruby/lib/algolia/api/monitoring_client.rb

@@ -489,7 +489,7 @@ def get_reachability_with_http_info(clusters, request_options = {})
     # @return [Hash<String, Hash>]
     def get_reachability(clusters, request_options = {})
       response = get_reachability_with_http_info(clusters, request_options)
-      @api_client.deserialize(response.body, request_options[:debug_return_type] || "Monitoring::Hash<String, Hash>")
+      @api_client.deserialize(response.body, request_options[:debug_return_type] || "Hash<String, Hash>")
     end
 
     # Retrieves the servers that belong to clusters.  The response depends on whether you authenticate your API request:  - With authentication, the response lists the servers assigned to your Algolia application&#39;s cluster.  - Without authentication, the response lists the servers for all Algolia clusters.

clients/algoliasearch-client-ruby/lib/algolia/api/search_client.rb

@@ -1245,7 +1245,7 @@ def get_dictionary_languages_with_http_info(request_options = {})
     # @return [Hash<String, Languages>]
     def get_dictionary_languages(request_options = {})
       response = get_dictionary_languages_with_http_info(request_options)
-      @api_client.deserialize(response.body, request_options[:debug_return_type] || "Search::Hash<String, Languages>")
+      @api_client.deserialize(response.body, request_options[:debug_return_type] || "Hash<String, Languages>")
     end
 
     # Retrieves the languages for which standard dictionary entries are turned off.
@@ -1400,7 +1400,7 @@ def get_object_with_http_info(index_name, object_id, attributes_to_retrieve = ni
     # @return [Object]
     def get_object(index_name, object_id, attributes_to_retrieve = nil, request_options = {})
       response = get_object_with_http_info(index_name, object_id, attributes_to_retrieve, request_options)
-      @api_client.deserialize(response.body, request_options[:debug_return_type] || "Search::Object")
+      @api_client.deserialize(response.body, request_options[:debug_return_type] || "Object")
     end
 
     # Retrieves one or more records, potentially from different indices.  Records are returned in the same order as the requests.

templates/ruby/api.mustache

@@ -225,7 +225,7 @@ module {{moduleName}}
     # @return [{{{returnType}}}{{^returnType}}nil{{/returnType}}]
     def {{operationId}}({{#allParams}}{{#required}}{{paramName}}, {{/required}}{{^required}}{{paramName}}=nil, {{/required}}{{/allParams}}request_options = {})
       {{#returnType}}response = {{/returnType}}{{operationId}}_with_http_info({{#allParams}}{{paramName}}, {{/allParams}}request_options)
-      {{#returnType}}@api_client.deserialize(response.body, request_options[:debug_return_type]{{#vendorExtensions}}{{#returnProperty}} || '{{#isArray}}Array<{{{modelModule}}}::{{complexType}}>{{/isArray}}{{^isArray}}{{^x-is-custom-request}}{{{modelModule}}}::{{/x-is-custom-request}}{{{dataType}}}{{/isArray}}'{{/returnProperty}}{{/vendorExtensions}}){{/returnType}}{{^returnType}}nil{{/returnType}}
+      {{#returnType}}@api_client.deserialize(response.body, request_options[:debug_return_type]{{#vendorExtensions}}{{#returnProperty}} || '{{#isArray}}Array<{{{modelModule}}}::{{complexType}}>{{/isArray}}{{^isArray}}{{^isPrimitiveType}}{{^isMap}}{{{modelModule}}}::{{/isMap}}{{/isPrimitiveType}}{{{dataType}}}{{/isArray}}'{{/returnProperty}}{{/vendorExtensions}}){{/returnType}}{{^returnType}}nil{{/returnType}}
     end
 {{^-last}}
 

tests/CTS/requests/search/getObject.json

@@ -15,5 +15,29 @@
         "attributesToRetrieve": "attr1%2Cattr2"
       }
     }
+  },
+  {
+    "testName": "search with a real object",
+    "parameters": {
+      "indexName": "cts_e2e_browse",
+      "objectID": "Batman and Robin"
+    },
+    "request": {
+      "path": "/1/indexes/cts_e2e_browse/Batman%20and%20Robin",
+      "method": "GET"
+    },
+    "response": {
+      "statusCode": 200,
+      "body": {
+        "objectID": "Batman and Robin",
+        "title": "Batman and Robin",
+        "year": 1949,
+        "cast": [
+          "Robert Lowery",
+          "Johnny Duncan",
+          "Jane Adams"
+        ]
+      }
+    }
   }
 ]

tests/output/csharp/src/generated/e2e/Search.test.cs

@@ -66,6 +66,27 @@ public async Task BrowseTest()
     }
   }
 
+  [Fact(DisplayName = "search with a real object")]
+  public async Task GetObjectTest1()
+  {
+    try
+    {
+      var resp = await client.GetObjectAsync("cts_e2e_browse", "Batman and Robin");
+      // Check status code 200
+      Assert.NotNull(resp);
+
+      JsonAssert.EqualOverrideDefault(
+        "{\"objectID\":\"Batman and Robin\",\"title\":\"Batman and Robin\",\"year\":1949,\"cast\":[\"Robert Lowery\",\"Johnny Duncan\",\"Jane Adams\"]}",
+        JsonSerializer.Serialize(resp, JsonConfig.Options),
+        new JsonDiffConfig(true)
+      );
+    }
+    catch (Exception e)
+    {
+      Assert.Fail("An exception was thrown: " + e.Message);
+    }
+  }
+
   [Fact(DisplayName = "getRule")]
   public async Task GetRuleTest()
   {

tests/output/csharp/src/generated/requests/Search.test.cs

@@ -1237,6 +1237,17 @@ public async Task GetObjectTest()
     }
   }
 
+  [Fact(DisplayName = "search with a real object")]
+  public async Task GetObjectTest1()
+  {
+    await client.GetObjectAsync("cts_e2e_browse", "Batman and Robin");
+
+    var req = _echo.LastResponse;
+    Assert.Equal("/1/indexes/cts_e2e_browse/Batman%20and%20Robin", req.Path);
+    Assert.Equal("GET", req.Method.ToString());
+    Assert.Null(req.Body);
+  }
+
   [Fact(DisplayName = "getObjects")]
   public async Task GetObjectsTest()
   {

tests/output/dart/test/requests/search_test.dart

@@ -1468,6 +1468,28 @@ void main() {
     ),
   );
 
+  // getObject
+  test(
+    'search with a real object',
+    () => runTest(
+      builder: (requester) => SearchClient(
+        appId: 'appId',
+        apiKey: 'apiKey',
+        options: ClientOptions(requester: requester),
+      ),
+      call: (client) => client.getObject(
+        indexName: "cts_e2e_browse",
+        objectID: "Batman and Robin",
+      ),
+      intercept: (request) {
+        expectPath(
+            request.path, '/1/indexes/cts_e2e_browse/Batman%20and%20Robin');
+        expect(request.method, 'get');
+        expect(request.body, null);
+      },
+    ),
+  );
+
   // getObjects
   test(
     'getObjects',

tests/output/go/tests/e2e/search_test.go

@@ -50,6 +50,21 @@ void browseTest() {
     );
   }
 
+  @Test
+  @DisplayName("search with a real object")
+  void getObjectTest1() {
+    Object res = client.getObject("cts_e2e_browse", "Batman and Robin");
+    assertDoesNotThrow(() ->
+      JSONAssert.assertEquals(
+        "{\"objectID\":\"Batman and Robin\",\"title\":\"Batman and" +
+        " Robin\",\"year\":1949,\"cast\":[\"Robert Lowery\",\"Johnny Duncan\",\"Jane" +
+        " Adams\"]}",
+        json.writeValueAsString(res),
+        JSONCompareMode.LENIENT
+      )
+    );
+  }
+
   @Test
   @DisplayName("getRule")
   void getRuleTest() {