Merge branch 'main' into meili-bot/docker

Author: alallema

.code-samples.meilisearch.yaml

@@ -444,7 +444,7 @@ getting_started_add_meteorites: |-
   Client client = new Client(new Config("http://127.0.0.1:7700", "masterKey"));
 
   client.index("meteorites").addDocuments(meteoritesJson);
-getting_started_update_rankingRules: |-
+getting_started_update_ranking_rules: |-
   Settings settings = new Settings();
   settings.setRankingRules(new String[]
   {
@@ -458,7 +458,7 @@ getting_started_update_rankingRules: |-
     "rank:desc"
   });
   client.index("movies").updateSettings(settings);
-getting_started_update_displayedAttributes: |-
+getting_started_update_displayed_attributes: |-
   Settings settings = new Settings();
   settings.setDisplayedAttributes(new String[]
   {
@@ -467,7 +467,7 @@ getting_started_update_displayedAttributes: |-
         "poster"
   });
   client.index("movies").updateSettings(settings);
-getting_started_update_searchableAttributes: |-
+getting_started_update_searchable_attributes: |-
   Settings settings = new Settings();
   settings.setSearchableAttributes(new String[]
   {
@@ -491,11 +491,11 @@ getting_started_filtering: |-
   SearchRequest searchRequest =
     new SearchRequest("").setFilter(new String[] {"mass < 200"});
   client.index("meteorites").search(searchRequest);
-getting_started_geoRadius: |-
+getting_started_geo_radius: |-
   SearchRequest searchRequest =
     new SearchRequest("").setFilter(new String[] {"_geoRadius(46.9480, 7.4474, 210000)"});
   client.index("meteorites").search(searchRequest); 
-getting_started_geoPoint: |-
+getting_started_geo_point: |-
   SearchRequest searchRequest =
     new SearchRequest("").setSort(new String[] {"_geoPoint(48.8583701,2.2922926):asc"});
   client.index("meteorites").search(searchRequest);
@@ -624,15 +624,17 @@ geosearch_guide_sort_usage_2: |-
       "rating:desc",
     });
   client.index("restaurants").search(searchRequest);
-document_guide_create_index_primary_key: |-
-  client.createIndex("movies", "reference_number");
-document_guide_add_document_primary_key: |-
-  client.index("movies").addDocuments("[{"
-    + "\"reference_number\": 287947,"
-    + "\"title\": \"Shazam\","
-    + "\"poster\": \"https://image.tmdb.org/t/p/w1280/xnopI5Xtky18MPhK40cZAGAOVeV.jpg\","
-    + "\"overview\": \"A boy is given the ability to become an adult superhero in times of need with a single magic word.\","
-    + "\"release_date\": \"2019-03-23\""
+primary_field_guide_update_document_primary_key: |-
+  client.updateIndex("books", "title");
+primary_field_guide_create_index_primary_key: |-
+  client.createIndex("books", "reference_number");
+primary_field_guide_add_document_primary_key: |-
+  client.index("books").addDocuments("[{"
+    + "\"reference_number\": 2879,"
+    + "\"title\": \"Diary of a Wimpy Kid\","
+    + "\"author\": \"Jeff Kinney\","
+    + "\"genres\": [\"comedy\", \"humor\"],"
+    + "\"price\": 5.00"
     + "}]"
   , "reference_number");
 security_guide_search_key_1: |-

README.md

@@ -99,12 +99,12 @@ class TestMeilisearch {
 
     JSONArray array = new JSONArray();
     ArrayList items = new ArrayList() {{
-      add(new JSONObject().put("id", "1").put("title", "Carol").put("genre",new JSONArray("[\"Romance\",\"Drama\"]")));
-      add(new JSONObject().put("id", "2").put("title", "Wonder Woman").put("genre",new JSONArray("[\"Action\",\"Adventure\"]")));
-      add(new JSONObject().put("id", "3").put("title", "Life of Pi").put("genre",new JSONArray("[\"Adventure\",\"Drama\"]")));
-      add(new JSONObject().put("id", "4").put("title", "Mad Max: Fury Road").put("genre",new JSONArray("[\"Adventure\",\"Science Fiction\"]")));
-      add(new JSONObject().put("id", "5").put("title", "Moana").put("genre",new JSONArray("[\"Fantasy\",\"Action\"]")));
-      add(new JSONObject().put("id", "6").put("title", "Philadelphia").put("genre",new JSONArray("[\"Drama\"]")));
+      add(new JSONObject().put("id", "1").put("title", "Carol").put("genres",new JSONArray("[\"Romance\",\"Drama\"]")));
+      add(new JSONObject().put("id", "2").put("title", "Wonder Woman").put("genres",new JSONArray("[\"Action\",\"Adventure\"]")));
+      add(new JSONObject().put("id", "3").put("title", "Life of Pi").put("genres",new JSONArray("[\"Adventure\",\"Drama\"]")));
+      add(new JSONObject().put("id", "4").put("title", "Mad Max: Fury Road").put("genres",new JSONArray("[\"Adventure\",\"Science Fiction\"]")));
+      add(new JSONObject().put("id", "5").put("title", "Moana").put("genres",new JSONArray("[\"Fantasy\",\"Action\"]")));
+      add(new JSONObject().put("id", "6").put("title", "Philadelphia").put("genres",new JSONArray("[\"Drama\"]")));
     }};
 
     array.put(items);
@@ -137,7 +137,7 @@ System.out.println(results);
 - Output:
 
 ```
-SearchResult(hits=[{id=1.0, title=Carol, genre:[Romance, Drama]}], offset=0, limit=20, nbHits=1, exhaustiveNbHits=false, facetsDistribution=null, exhaustiveFacetsCount=false, processingTimeMs=3, query=carlo)
+SearchResult(hits=[{id=1.0, title=Carol, genres:[Romance, Drama]}], offset=0, limit=20, nbHits=1, exhaustiveNbHits=false, facetsDistribution=null, exhaustiveFacetsCount=false, processingTimeMs=3, query=carlo)
 ```
 
 #### Custom Search <!-- omit in toc -->
@@ -164,11 +164,11 @@ System.out.println(results.getHits());
 [{
   "id":3,
   "title":"Life of Pi",
-  "genre":["Adventure","Drama"],
+  "genres":["Adventure","Drama"],
   "_formatted":{
     "id":3,
     "title":"Life <em>of</em> Pi",
-    "genre":["Adventure","Drama"]
+    "genres":["Adventure","Drama"]
   },
   "_matchesInfo":{
     "title":[{