Skip to content

Commit 128d3f3

Browse files
IGNITE-27831 Java thin: Refactor ReliableChannel - Fixes #12733.
Signed-off-by: Aleksey Plekhanov <plehanov.alex@gmail.com>
1 parent 4e2e691 commit 128d3f3

18 files changed

+214
-126
lines changed

modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientAtomicLongImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class ClientAtomicLongImpl implements ClientAtomicLong {
3535
private final String groupName;
3636

3737
/** */
38-
private final ReliableChannel ch;
38+
private final ReliableChannelEx ch;
3939

4040
/** Cache id. */
4141
private final int cacheId;
@@ -47,7 +47,7 @@ public class ClientAtomicLongImpl implements ClientAtomicLong {
4747
* @param groupName Cache group name.
4848
* @param ch Channel.
4949
*/
50-
public ClientAtomicLongImpl(String name, @Nullable String groupName, ReliableChannel ch) {
50+
public ClientAtomicLongImpl(String name, @Nullable String groupName, ReliableChannelEx ch) {
5151
// name and groupName uniquely identify the data structure.
5252
this.name = name;
5353
this.groupName = groupName;

modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientCacheEntryListenerHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public class ClientCacheEntryListenerHandler<K, V> implements NotificationListen
5353
private final Cache<K, V> jCacheAdapter;
5454

5555
/** */
56-
private final ReliableChannel ch;
56+
private final ReliableChannelEx ch;
5757

5858
/** */
5959
private final boolean keepBinary;
@@ -76,7 +76,7 @@ public class ClientCacheEntryListenerHandler<K, V> implements NotificationListen
7676
/** */
7777
ClientCacheEntryListenerHandler(
7878
Cache<K, V> jCacheAdapter,
79-
ReliableChannel ch,
79+
ReliableChannelEx ch,
8080
ClientBinaryMarshaller marsh,
8181
boolean keepBinary
8282
) {

modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientClusterGroupImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
*/
5757
class ClientClusterGroupImpl implements ClientClusterGroup {
5858
/** Channel. */
59-
protected final ReliableChannel ch;
59+
protected final ReliableChannelEx ch;
6060

6161
/** Marshaller utils. */
6262
protected final ClientUtils utils;
@@ -79,7 +79,7 @@ class ClientClusterGroupImpl implements ClientClusterGroup {
7979
/**
8080
*
8181
*/
82-
ClientClusterGroupImpl(ReliableChannel ch, ClientBinaryMarshaller marsh) {
82+
ClientClusterGroupImpl(ReliableChannelEx ch, ClientBinaryMarshaller marsh) {
8383
this.ch = ch;
8484

8585
utils = new ClientUtils(marsh);
@@ -90,7 +90,7 @@ class ClientClusterGroupImpl implements ClientClusterGroup {
9090
/**
9191
*
9292
*/
93-
private ClientClusterGroupImpl(ReliableChannel ch, ClientUtils utils,
93+
private ClientClusterGroupImpl(ReliableChannelEx ch, ClientUtils utils,
9494
ProjectionFilters projectionFilters) {
9595
this.ch = ch;
9696
this.utils = utils;

modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientClusterImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class ClientClusterImpl extends ClientClusterGroupImpl implements ClientC
3333
/**
3434
* Constructor.
3535
*/
36-
ClientClusterImpl(ReliableChannel ch, ClientBinaryMarshaller marsh) {
36+
ClientClusterImpl(ReliableChannelEx ch, ClientBinaryMarshaller marsh) {
3737
super(ch, marsh);
3838

3939
dfltClusterGrp = (ClientClusterGroupImpl)forServers();

modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientComputeImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class ClientComputeImpl implements ClientCompute {
5757
private static final byte NO_RESULT_CACHE_FLAG_MASK = 0x02;
5858

5959
/** Channel. */
60-
private final ReliableChannel ch;
60+
private final ReliableChannelEx ch;
6161

6262
/** Utils for serialization/deserialization. */
6363
private final ClientUtils utils;
@@ -69,7 +69,7 @@ class ClientComputeImpl implements ClientCompute {
6969
private final AtomicInteger tasksCnt = new AtomicInteger();
7070

7171
/** Constructor. */
72-
ClientComputeImpl(ReliableChannel ch, ClientBinaryMarshaller marsh, ClientClusterGroupImpl dfltGrp) {
72+
ClientComputeImpl(ReliableChannelEx ch, ClientBinaryMarshaller marsh, ClientClusterGroupImpl dfltGrp) {
7373
this.ch = ch;
7474
this.dfltGrp = dfltGrp;
7575

modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientFieldsQueryPager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class ClientFieldsQueryPager extends GenericQueryPager<List<?>> implements Field
4040

4141
/** Constructor. */
4242
ClientFieldsQueryPager(
43-
ReliableChannel ch,
43+
ReliableChannelEx ch,
4444
@Nullable TcpClientTransaction tx,
4545
ClientOperation qryOp,
4646
ClientOperation pageQryOp,
@@ -59,7 +59,7 @@ class ClientFieldsQueryPager extends GenericQueryPager<List<?>> implements Field
5959

6060
/** Constructor. */
6161
ClientFieldsQueryPager(
62-
ReliableChannel ch,
62+
ReliableChannelEx ch,
6363
@Nullable TcpClientTransaction tx,
6464
ClientOperation qryOp,
6565
ClientOperation pageQryOp,

modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientIgniteSetImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class ClientIgniteSetImpl<T> implements ClientIgniteSet<T> {
4343
private final String name;
4444

4545
/** */
46-
private final ReliableChannel ch;
46+
private final ReliableChannelEx ch;
4747

4848
/** */
4949
private final ClientUtils serDes;
@@ -69,7 +69,7 @@ class ClientIgniteSetImpl<T> implements ClientIgniteSet<T> {
6969
* @param cacheId Cache id.
7070
*/
7171
public ClientIgniteSetImpl(
72-
ReliableChannel ch,
72+
ReliableChannelEx ch,
7373
ClientUtils serDes,
7474
String name,
7575
boolean colocated,

modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientQueryPager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class ClientQueryPager<K, V> extends GenericQueryPager<Cache.Entry<K, V>> {
3636

3737
/** Constructor. */
3838
ClientQueryPager(
39-
ReliableChannel ch,
39+
ReliableChannelEx ch,
4040
@Nullable TcpClientTransaction tx,
4141
ClientOperation qryOp,
4242
ClientOperation pageQryOp,
@@ -53,7 +53,7 @@ class ClientQueryPager<K, V> extends GenericQueryPager<Cache.Entry<K, V>> {
5353

5454
/** Constructor. */
5555
ClientQueryPager(
56-
ReliableChannel ch,
56+
ReliableChannelEx ch,
5757
@Nullable TcpClientTransaction tx,
5858
ClientOperation qryOp,
5959
ClientOperation pageQryOp,

modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientServicesImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class ClientServicesImpl implements ClientServices {
5757
static final int SRV_TOP_UPDATE_PERIOD = 60_000;
5858

5959
/** Channel. */
60-
private final ReliableChannel ch;
60+
private final ReliableChannelImpl ch;
6161

6262
/** Binary marshaller. */
6363
private final ClientBinaryMarshaller marsh;
@@ -75,7 +75,7 @@ class ClientServicesImpl implements ClientServices {
7575
private final Map<String, ServiceTopology> servicesTopologies;
7676

7777
/** Constructor. */
78-
ClientServicesImpl(ReliableChannel ch, ClientBinaryMarshaller marsh, ClientClusterGroupImpl grp, IgniteLogger log) {
78+
ClientServicesImpl(ReliableChannelImpl ch, ClientBinaryMarshaller marsh, ClientClusterGroupImpl grp, IgniteLogger log) {
7979
this.ch = ch;
8080
this.marsh = marsh;
8181
this.grp = grp;

modules/core/src/main/java/org/apache/ignite/internal/client/thin/GenericQueryPager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ abstract class GenericQueryPager<T> implements QueryPager<T> {
3939
private final Consumer<PayloadOutputChannel> qryWriter;
4040

4141
/** Channel. */
42-
private final ReliableChannel ch;
42+
private final ReliableChannelEx ch;
4343

4444
/** Client Transaction. */
4545
private final @Nullable TcpClientTransaction tx;
@@ -64,7 +64,7 @@ abstract class GenericQueryPager<T> implements QueryPager<T> {
6464

6565
/** Constructor. */
6666
GenericQueryPager(
67-
ReliableChannel ch,
67+
ReliableChannelEx ch,
6868
@Nullable TcpClientTransaction tx,
6969
ClientOperation qryOp,
7070
ClientOperation pageQryOp,
@@ -83,7 +83,7 @@ abstract class GenericQueryPager<T> implements QueryPager<T> {
8383

8484
/** Constructor. */
8585
GenericQueryPager(
86-
ReliableChannel ch,
86+
ReliableChannelEx ch,
8787
@Nullable TcpClientTransaction tx,
8888
ClientOperation qryOp,
8989
ClientOperation pageQryOp,

0 commit comments

Comments
 (0)