You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by pt...@apache.org on 2022/04/14 17:01:45 UTC
[ignite-3] branch ignite-16771 updated: Fix code style
This is an automated email from the ASF dual-hosted git repository.
ptupitsyn pushed a commit to branch ignite-16771
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/ignite-16771 by this push:
new a9b77579d Fix code style
a9b77579d is described below
commit a9b77579d8808c3e3ba51c8f74a42fa550620545
Author: Pavel Tupitsyn <pt...@apache.org>
AuthorDate: Thu Apr 14 20:01:39 2022 +0300
Fix code style
---
.../java/org/apache/ignite/internal/client/ReliableChannel.java | 6 +++---
.../org/apache/ignite/internal/client/compute/ClientCompute.java | 3 +--
.../test/java/org/apache/ignite/client/TestClientHandlerModule.java | 1 +
.../client/src/test/java/org/apache/ignite/client/TestServer.java | 2 --
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/modules/client/src/main/java/org/apache/ignite/internal/client/ReliableChannel.java b/modules/client/src/main/java/org/apache/ignite/internal/client/ReliableChannel.java
index 621551af7..0a255ef30 100644
--- a/modules/client/src/main/java/org/apache/ignite/internal/client/ReliableChannel.java
+++ b/modules/client/src/main/java/org/apache/ignite/internal/client/ReliableChannel.java
@@ -588,13 +588,13 @@ public final class ReliableChannel implements AutoCloseable {
List<ClientChannelHolder> holders = channels;
for (ClientChannelHolder hld : holders) {
- if (closed)
+ if (closed) {
return; // New reinit task scheduled or channel is closed.
+ }
try {
hld.getOrCreateChannel(true);
- }
- catch (Exception ignore) {
+ } catch (Exception ignore) {
// No-op.
}
}
diff --git a/modules/client/src/main/java/org/apache/ignite/internal/client/compute/ClientCompute.java b/modules/client/src/main/java/org/apache/ignite/internal/client/compute/ClientCompute.java
index 42dc3ce11..9b414f0bd 100644
--- a/modules/client/src/main/java/org/apache/ignite/internal/client/compute/ClientCompute.java
+++ b/modules/client/src/main/java/org/apache/ignite/internal/client/compute/ClientCompute.java
@@ -132,8 +132,7 @@ public class ClientCompute implements IgniteCompute {
return ch.serviceAsync(ClientOp.COMPUTE_EXECUTE, w -> {
if (w.clientChannel().protocolContext().clusterNode().name().equals(node.name())) {
w.out().packNil();
- }
- else {
+ } else {
w.out().packString(node.name());
}
diff --git a/modules/client/src/test/java/org/apache/ignite/client/TestClientHandlerModule.java b/modules/client/src/test/java/org/apache/ignite/client/TestClientHandlerModule.java
index cd9c9b813..467d1ffe6 100644
--- a/modules/client/src/test/java/org/apache/ignite/client/TestClientHandlerModule.java
+++ b/modules/client/src/test/java/org/apache/ignite/client/TestClientHandlerModule.java
@@ -71,6 +71,7 @@ public class TestClientHandlerModule implements IgniteComponent {
/**
* Constructor.
+ *
* @param ignite Ignite.
* @param registry Configuration registry.
* @param bootstrapFactory Bootstrap factory.
diff --git a/modules/client/src/test/java/org/apache/ignite/client/TestServer.java b/modules/client/src/test/java/org/apache/ignite/client/TestServer.java
index 458c7d497..15bef2694 100644
--- a/modules/client/src/test/java/org/apache/ignite/client/TestServer.java
+++ b/modules/client/src/test/java/org/apache/ignite/client/TestServer.java
@@ -43,9 +43,7 @@ import org.apache.ignite.network.ClusterNode;
import org.apache.ignite.network.ClusterService;
import org.apache.ignite.network.NettyBootstrapFactory;
import org.apache.ignite.network.NetworkAddress;
-import org.jetbrains.annotations.NotNull;
import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
/**
* Test server.