This is an automated email from the ASF dual-hosted git repository. apkhmv pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push: new 954682fa80 IGNITE-21707: Update openapi generator (#3370) 954682fa80 is described below commit 954682fa80a0e7c64d855f7cb2e342d309384d36 Author: Aleksandr Pakhomov <apk...@gmail.com> AuthorDate: Thu Mar 7 13:53:23 2024 +0300 IGNITE-21707: Update openapi generator (#3370) --- gradle/libs.versions.toml | 2 +- .../internal/cli/core/repl/registry/impl/NodeNameRegistryImpl.java | 4 ++-- .../cli/core/exception/handler/IgniteCliApiExceptionHandlerTest.java | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 02b4fbb46b..ca1d04250b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -86,7 +86,7 @@ checkstyleTool = "10.3.3" jacocoTool = "0.8.11" [plugins] -openapiGenerator = "org.openapi.generator:5.4.0" +openapiGenerator = "org.openapi.generator:7.3.0" javacc = "com.intershop.gradle.javacc:4.1.3" shadow = "com.github.johnrengelman.shadow:7.1.2" cmake = "net.freudasoft.gradle-cmake-plugin:0.0.4" diff --git a/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/registry/impl/NodeNameRegistryImpl.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/registry/impl/NodeNameRegistryImpl.java index 693cabca1d..aa1e21ab6c 100644 --- a/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/registry/impl/NodeNameRegistryImpl.java +++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/registry/impl/NodeNameRegistryImpl.java @@ -32,7 +32,7 @@ import org.apache.ignite.internal.cli.core.repl.registry.NodeNameRegistry; import org.apache.ignite.internal.cli.logger.CliLoggers; import org.apache.ignite.internal.logger.IgniteLogger; import org.apache.ignite.rest.client.model.ClusterNode; -import org.apache.ignite.rest.client.model.NodeMetadata; +import org.apache.ignite.rest.client.model.ClusterNodeMetadata; import org.jetbrains.annotations.Nullable; /** Implementation of {@link NodeNameRegistry}. */ @@ -87,7 +87,7 @@ public class NodeNameRegistryImpl implements NodeNameRegistry, PeriodicSessionTa } @Nullable - private static String urlFromClusterNode(NodeMetadata metadata) { + private static String urlFromClusterNode(ClusterNodeMetadata metadata) { if (metadata == null) { return null; } diff --git a/modules/cli/src/test/java/org/apache/ignite/internal/cli/core/exception/handler/IgniteCliApiExceptionHandlerTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/core/exception/handler/IgniteCliApiExceptionHandlerTest.java index 9f1d0ab2cd..4498484e51 100644 --- a/modules/cli/src/test/java/org/apache/ignite/internal/cli/core/exception/handler/IgniteCliApiExceptionHandlerTest.java +++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/core/exception/handler/IgniteCliApiExceptionHandlerTest.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.cli.core.exception.handler; +import static org.mockito.ArgumentMatchers.contains; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -47,7 +48,7 @@ class IgniteCliApiExceptionHandlerTest extends BaseIgniteAbstractTest { igniteCliApiExceptionHandler.handle(exceptionWriter, igniteCliApiException); // Then - verify(exceptionWriter, times(1)).write(eq("Missing the required parameter")); + verify(exceptionWriter, times(1)).write(contains("Message: Missing the required parameter")); } @Test