From 0ac9dc19a7c1330b405205436156cc8c778fee45 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Jun 2025 19:01:01 +0000 Subject: [PATCH 1/2] Bump the gradle-dependencies group across 1 directory with 4 updates Bumps the gradle-dependencies group with 4 updates in the / directory: [org.junit:junit-bom](https://github.com/junit-team/junit5), [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5), [org.mockito:mockito-core](https://github.com/mockito/mockito) and com.diffplug.spotless. Updates `org.junit:junit-bom` from 5.11.4 to 5.13.0 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.4...r5.13.0) Updates `org.junit.jupiter:junit-jupiter` from 5.11.4 to 5.13.0 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.4...r5.13.0) Updates `org.mockito:mockito-core` from 4.9.0 to 4.11.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.9.0...v4.11.0) Updates `com.diffplug.spotless` from 6.13.0 to 7.0.4 --- updated-dependencies: - dependency-name: org.junit:junit-bom dependency-version: 5.13.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gradle-dependencies - dependency-name: org.junit.jupiter:junit-jupiter dependency-version: 5.13.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gradle-dependencies - dependency-name: org.mockito:mockito-core dependency-version: 4.11.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gradle-dependencies - dependency-name: com.diffplug.spotless dependency-version: 7.0.4 dependency-type: direct:production update-type: version-update:semver-major dependency-group: gradle-dependencies ... Signed-off-by: dependabot[bot] --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 8c004ec7..ea50bf90 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ plugins { id 'signing' id 'jacoco' id "io.github.gradle-nexus.publish-plugin" version "2.0.0" - id "com.diffplug.spotless" version "6.13.0" + id "com.diffplug.spotless" version "7.0.4" } group = 'com.meilisearch.sdk' @@ -56,10 +56,10 @@ dependencies { api 'com.squareup.okhttp3:okhttp:4.12.0' // Use JUnit test framework - testImplementation(platform('org.junit:junit-bom:5.11.4')) - testImplementation('org.junit.jupiter:junit-jupiter:5.11.4') + testImplementation(platform('org.junit:junit-bom:5.13.0')) + testImplementation('org.junit.jupiter:junit-jupiter:5.13.0') // https://mvnrepository.com/artifact/org.mockito/mockito-core - testImplementation 'org.mockito:mockito-core:4.9.0' + testImplementation 'org.mockito:mockito-core:4.11.0' testImplementation 'org.hamcrest:hamcrest:3.0' testImplementation 'com.squareup.okio:okio:3.12.0' testImplementation 'com.squareup.okhttp3:okhttp:4.12.0' From f1718a3aa51b3860a6ca89c8cae321e303589d37 Mon Sep 17 00:00:00 2001 From: Bruno Casali Date: Thu, 5 Jun 2025 16:08:18 -0300 Subject: [PATCH 2/2] Fix a few warnings --- build.gradle | 31 ++++++++++++------- docker-compose.yml | 4 +-- .../meilisearch/sdk/MultiSearchRequest.java | 2 +- .../com/meilisearch/sdk/SettingsHandler.java | 2 ++ .../sdk/json/GsonJsonHandlerTest.java | 17 +++++----- 5 files changed, 31 insertions(+), 25 deletions(-) diff --git a/build.gradle b/build.gradle index ea50bf90..7d9da01f 100644 --- a/build.gradle +++ b/build.gradle @@ -13,18 +13,13 @@ plugins { id 'signing' id 'jacoco' id "io.github.gradle-nexus.publish-plugin" version "2.0.0" - id "com.diffplug.spotless" version "7.0.4" + id "com.diffplug.spotless" version "6.13.0" } group = 'com.meilisearch.sdk' archivesBaseName = 'meilisearch-java' version = '0.14.7' -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - jacoco { toolVersion = "0.8.8" reportsDirectory = layout.buildDirectory.dir("$projectDir/tmp/coverage") @@ -92,13 +87,12 @@ task buildJar(type: Jar) { } test { - finalizedBy jacocoTestReport useJUnitPlatform { - excludeTags('integration') + excludeTags 'integration' } - + finalizedBy jacocoTestReport testLogging { - events 'passed', 'skipped', 'failed' + events 'passed', 'skipped', 'failed' } } @@ -114,7 +108,7 @@ jacocoTestReport { task integrationTest(type: Test) { useJUnitPlatform { - includeTags('integration') + includeTags 'integration' } testLogging { events 'passed', 'skipped', 'failed' @@ -123,10 +117,17 @@ task integrationTest(type: Test) { } java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + withJavadocJar() withSourcesJar() } +tasks.withType(JavaCompile).configureEach { + options.compilerArgs += ['-Xlint:deprecation', '-Xlint:unchecked'] +} + publishing { publications { mavenJava(MavenPublication) { @@ -195,3 +196,11 @@ spotless { googleJavaFormat('1.7').aosp() } } + +testing { + suites { + test { + useJUnitJupiter() + } + } +} diff --git a/docker-compose.yml b/docker-compose.yml index 9a93a135..ee3829e1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,6 @@ -version: "3.8" - services: package: - image: azul/zulu-openjdk:8-latest + image: azul/zulu-openjdk:11-latest tty: true stdin_open: true working_dir: /home/package diff --git a/src/main/java/com/meilisearch/sdk/MultiSearchRequest.java b/src/main/java/com/meilisearch/sdk/MultiSearchRequest.java index f22b4c2b..28fb622f 100644 --- a/src/main/java/com/meilisearch/sdk/MultiSearchRequest.java +++ b/src/main/java/com/meilisearch/sdk/MultiSearchRequest.java @@ -6,7 +6,7 @@ public class MultiSearchRequest { private ArrayList queries; public MultiSearchRequest() { - this.queries = new ArrayList(); + this.queries = new ArrayList(); } /* diff --git a/src/main/java/com/meilisearch/sdk/SettingsHandler.java b/src/main/java/com/meilisearch/sdk/SettingsHandler.java index c70f9f80..ee47d902 100644 --- a/src/main/java/com/meilisearch/sdk/SettingsHandler.java +++ b/src/main/java/com/meilisearch/sdk/SettingsHandler.java @@ -706,6 +706,7 @@ public String[] getSeparatorTokensSettings(String uid) { * Updates the separator tokens settings of the index * * @param uid Index identifier + * @param separatorTokens an array of strings that contains the new separator tokens settings * @return TaskInfo instance * @throws MeilisearchException if an error occurs */ @@ -746,6 +747,7 @@ public String[] getNonSeparatorTokensSettings(String uid) { * Updates the non-separator tokens settings of the index * * @param uid Index identifier + * @param separatorTokens an array of strings that contains the new separator tokens settings * @return TaskInfo instance * @throws MeilisearchException if an error occurs */ diff --git a/src/test/java/com/meilisearch/sdk/json/GsonJsonHandlerTest.java b/src/test/java/com/meilisearch/sdk/json/GsonJsonHandlerTest.java index 4a9ee341..52c46d9d 100644 --- a/src/test/java/com/meilisearch/sdk/json/GsonJsonHandlerTest.java +++ b/src/test/java/com/meilisearch/sdk/json/GsonJsonHandlerTest.java @@ -28,6 +28,7 @@ import java.util.stream.Stream; import lombok.Getter; import org.junit.jupiter.api.Test; +import org.mockito.Mockito; class GsonJsonHandlerTest { @@ -68,16 +69,11 @@ void encodeAnObject() { @Test void encodeThrowsJsonEncodingExceptionWhenGsonThrowsException() { - assertThrows( - JsonEncodingException.class, - () -> - classToTest.encode( - new JsonElement() { - @Override - public JsonElement deepCopy() { - return null; - } - })); + JsonElement mockElement = Mockito.mock(JsonElement.class); + // Optionally mock behavior (if needed): + // Mockito.when(mockElement.deepCopy()).thenReturn(null); + + assertThrows(JsonEncodingException.class, () -> classToTest.encode(mockElement)); } @Test @@ -161,6 +157,7 @@ void deserializeWithParametersEmpty() throws Exception { void deserializeMap() throws Exception { String mapString = "{\"commitSha\":\"b46889b5f0f2f8b91438a08a358ba8f05fc09fc1\",\"commitDate\":\"2019-11-15T09:51:54.278247+00:00\",\"pkgVersion\":\"0.1.1\"}"; + @SuppressWarnings("unchecked") HashMap decode = classToTest.decode(mapString, HashMap.class, String.class, String.class);