Merge main branch

Author: alallema

.code-samples.meilisearch.yaml

@@ -267,11 +267,24 @@ search_parameter_guide_crop_1: |-
   SearchRequest searchRequest =
     new SearchRequest("shifu")
       .setAttributesToCrop(new String[] {"overview"})
-      .setCropLength(10);
+      .setCropLength(5);
+  client.index("movies").search(searchRequest);
+search_parameter_guide_crop_marker_1: |-
+  SearchRequest searchRequest =
+    new SearchRequest("shifu")
+      .setAttributesToCrop(new String[] {"overview"})
+      .setCropMarker("[…]");
   client.index("movies").search(searchRequest);
 search_parameter_guide_highlight_1: |-
   SearchRequest searchRequest =
-    new SearchRequest("and").setAttributesToHighlight(new String[] {"overview"});
+    new SearchRequest("winter feast").setAttributesToHighlight(new String[] {"overview"});
+  client.index("movies").search(searchRequest);
+search_parameter_guide_highlight_tag_1: |-
+  SearchRequest searchRequest =
+    new SearchRequest("winter feast")
+    .setAttributesToHighlight(new String[] {"overview"})
+    .setHighlightPreTag("<span class=\"highlight\">")
+    .setHighlightPostTag("</span>");
   client.index("movies").search(searchRequest);
 search_parameter_guide_matches_1: |-
   SearchRequest searchRequest = new SearchRequest("winter feast").setMatches(true);
@@ -384,15 +397,15 @@ getting_started_add_documents_md: |-
   <dependency>
     <groupId>com.meilisearch.sdk</groupId>
     <artifactId>meilisearch-java</artifactId>
-    <version>0.7.0</version>
+    <version>0.7.2</version>
     <type>pom</type>
   </dependency>
   ```
 
   **Gradle**
   Add the following line to the `dependencies` section of your `build.gradle`:
   ```groovy
-  implementation 'com.meilisearch.sdk:meilisearch-java:0.7.0'
+  implementation 'com.meilisearch.sdk:meilisearch-java:0.7.2'
   ```
 
   ```java

README.md

@@ -53,7 +53,7 @@ Add the following code to the `<dependencies>` section of your project:
 <dependency>
   <groupId>com.meilisearch.sdk</groupId>
   <artifactId>meilisearch-java</artifactId>
-  <version>0.7.0</version>
+  <version>0.7.2</version>
   <type>pom</type>
 </dependency>
 ```
@@ -63,7 +63,7 @@ Add the following code to the `<dependencies>` section of your project:
 Add the following line to the `dependencies` section of your `build.gradle`:
 
 ```groovy
-implementation 'com.meilisearch.sdk:meilisearch-java:0.7.0'
+implementation 'com.meilisearch.sdk:meilisearch-java:0.7.2'
 ```
 
 ### Run Meilisearch <!-- omit in toc -->

build.gradle

@@ -12,12 +12,12 @@ plugins {
 	id 'maven-publish'
 	id 'signing'
 	id 'io.codearte.nexus-staging' version '0.30.0'
-	id "com.diffplug.spotless" version "6.3.0"
+	id "com.diffplug.spotless" version "6.5.2"
 }
 
 group = 'com.meilisearch.sdk'
 archivesBaseName = 'meilisearch-java'
-version = '0.7.1'
+version = '0.7.2'
 
 java {
 	sourceCompatibility = JavaVersion.VERSION_1_8
@@ -37,7 +37,7 @@ dependencies {
 	// This dependency is used internally, and not exposed to consumers on their own compile classpath.
 	implementation 'com.google.guava:guava:31.1-jre'
 	implementation 'com.google.code.gson:gson:2.9.0'
-	implementation 'org.json:json:20211205'
+	implementation 'org.json:json:20220320'
 	// https://mvnrepository.com/artifact/org.apache.httpcomponents.client5/httpclient5
 	compileOnly group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.1.3'
 	compileOnly 'com.squareup.okhttp3:okhttp:4.9.3'
@@ -46,22 +46,22 @@ dependencies {
 	testImplementation(platform('org.junit:junit-bom:5.8.2'))
 	testImplementation('org.junit.jupiter:junit-jupiter:5.8.2')
 	// https://mvnrepository.com/artifact/org.mockito/mockito-core
-	testImplementation 'org.mockito:mockito-core:4.4.0'
+	testImplementation 'org.mockito:mockito-core:4.5.1'
 	testImplementation 'org.hamcrest:hamcrest:2.2'
 
 	// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
-	compileOnly group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.2'
+	compileOnly group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.2.2'
 	compileOnly group: 'jakarta.json.bind', name: 'jakarta.json.bind-api', version: '2.0.0'
 	testImplementation group: 'org.eclipse', name: 'yasson', version: '2.0.4'
 
 	// Lombok
-	compileOnly 'org.projectlombok:lombok:1.18.22'
+	compileOnly 'org.projectlombok:lombok:1.18.24'
 	annotationProcessor 'org.projectlombok:lombok:1.18.22'
-	testCompileOnly 'org.projectlombok:lombok:1.18.16'
+	testCompileOnly 'org.projectlombok:lombok:1.18.24'
 	testAnnotationProcessor 'org.projectlombok:lombok:1.18.16'
 
 	// Jwt
-	implementation 'com.auth0:java-jwt:3.18.3'
+	implementation 'com.auth0:java-jwt:3.19.2'
 }
 
 task buildJar(type: Jar) {

src/main/java/com/meilisearch/sdk/Config.java

@@ -1,6 +1,9 @@
 package com.meilisearch.sdk;
 
+import lombok.Getter;
+
 /** Meilisearch configuration */
+@Getter
 public class Config {
     String hostUrl;
     String apiKey;
@@ -25,24 +28,6 @@ public Config(String hostUrl, String apiKey) {
         this.apiKey = apiKey;
     }
 
-    /**
-     * Method for returning the hostUrl
-     *
-     * @return host URL string of the Meilisearch instance
-     */
-    public String getHostUrl() {
-        return hostUrl;
-    }
-
-    /**
-     * Method for returning the apiKey
-     *
-     * @return API key String
-     */
-    public String getApiKey() {
-        return apiKey;
-    }
-
     /**
      * Method for returning the concatenated Bearer header with apiKey
      *

src/main/java/com/meilisearch/sdk/Details.java

@@ -1,7 +1,11 @@
 package com.meilisearch.sdk;
 
 import java.util.Map;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class Details {
 
     public Details() {}
@@ -18,109 +22,4 @@ public Details() {}
     protected String[] stopWords;
     protected Map<String, String[]> synonyms;
     protected String distinctAttribute;
-    protected TypoTolerance typoTolerance;
-
-    public int getReceivedDocuments() {
-        return receivedDocuments;
-    }
-
-    public void setReceivedDocuments(int receivedDocuments) {
-        this.receivedDocuments = receivedDocuments;
-    }
-
-    public int getIndexedDocuments() {
-        return indexedDocuments;
-    }
-
-    public void setIndexedDocuments(int indexedDocuments) {
-        this.indexedDocuments = indexedDocuments;
-    }
-
-    public int getDeletedDocuments() {
-        return deletedDocuments;
-    }
-
-    public void setDeletedDocuments(int deletedDocuments) {
-        this.deletedDocuments = deletedDocuments;
-    }
-
-    public String getPrimaryKey() {
-        return primaryKey;
-    }
-
-    public void setPrimaryKey(String primaryKey) {
-        this.primaryKey = primaryKey;
-    }
-
-    public String[] getRankingRules() {
-        return rankingRules;
-    }
-
-    public void setRankingRules(String[] rankingRules) {
-        this.rankingRules = rankingRules;
-    }
-
-    public String[] getSearchableAttributes() {
-        return searchableAttributes;
-    }
-
-    public void setSearchableAttributes(String[] searchableAttributes) {
-        this.searchableAttributes = searchableAttributes;
-    }
-
-    public String[] getDisplayedAttributes() {
-        return displayedAttributes;
-    }
-
-    public void setDisplayedAttributes(String[] displayedAttributes) {
-        this.displayedAttributes = displayedAttributes;
-    }
-
-    public String[] getFilterableAttributes() {
-        return filterableAttributes;
-    }
-
-    public void setFilterableAttributes(String[] filterableAttributes) {
-        this.filterableAttributes = filterableAttributes;
-    }
-
-    public String[] getSortableAttributes() {
-        return sortableAttributes;
-    }
-
-    public void setSortableAttributes(String[] sortableAttributes) {
-        this.sortableAttributes = sortableAttributes;
-    }
-
-    public String[] getStopWords() {
-        return stopWords;
-    }
-
-    public void setStopWords(String[] stopWords) {
-        this.stopWords = stopWords;
-    }
-
-    public Map<String, String[]> getSynonyms() {
-        return synonyms;
-    }
-
-    public void setSynonyms(Map<String, String[]> synonyms) {
-        this.synonyms = synonyms;
-    }
-
-    public String getDistinctAttribute() {
-        return distinctAttribute;
-    }
-
-    public void setDistinctAttribute(String distinctAttribute) {
-        this.distinctAttribute = distinctAttribute;
-    }
-
-    public TypoTolerance getTypoTolerance() {
-        return typoTolerance;
-    }
-
-    public void setTypoTolerance(TypoTolerance typoTolerance) {
-        this.typoTolerance = typoTolerance;
-    }
 }

src/main/java/com/meilisearch/sdk/Dump.java

@@ -4,9 +4,10 @@
 import lombok.ToString;
 
 /** Meilisearch dump */
+@Getter
 public class Dump {
-    @Getter private String status;
-    @Getter private String uid;
-    @Getter @ToString.Exclude private String startedAt;
-    @Getter @ToString.Exclude private String finishedAt;
+    private String status;
+    private String uid;
+    @ToString.Exclude private String startedAt;
+    @ToString.Exclude private String finishedAt;
 }

src/main/java/com/meilisearch/sdk/GenericServiceTemplate.java

@@ -9,7 +9,9 @@
 import com.meilisearch.sdk.http.request.HttpRequest;
 import com.meilisearch.sdk.http.response.HttpResponse;
 import com.meilisearch.sdk.json.JsonHandler;
+import lombok.Getter;
 
+@Getter
 public class GenericServiceTemplate implements ServiceTemplate {
     private final AbstractHttpClient client;
     private final JsonHandler processor;
@@ -27,24 +29,6 @@ public GenericServiceTemplate(
         this.requestFactory = requestFactory;
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public AbstractHttpClient getClient() {
-        return client;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public JsonHandler getProcessor() {
-        return processor;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public RequestFactory getRequestFactory() {
-        return requestFactory;
-    }
-
     /** {@inheritDoc} */
     @Override
     @SuppressWarnings("unchecked")