From 4234765836452d738abc37fa9e5b42e690487a7e Mon Sep 17 00:00:00 2001 From: vozerov-gridgain Date: Tue, 3 Feb 2015 12:21:40 +0300 Subject: [PATCH] #ignite-128: WIP. --- modules/clients/config/grid-client-spring-config.xml | 6 +++--- .../ignite/client/ClientAbstractMultiThreadedSelfTest.java | 1 + .../apache/ignite/client/ClientDefaultCacheSelfTest.java | 3 ++- .../apache/ignite/client/ClientReconnectionSelfTest.java | 1 + .../ignite/client/ClientTcpMultiThreadedSelfTest.java | 1 + .../ignite/client/ClientTcpSslAuthenticationSelfTest.java | 1 + .../ignite/client/ClientTcpSslMultiThreadedSelfTest.java | 1 + .../ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java | 1 + .../apache/ignite/client/ClientTopologyCacheSelfTest.java | 1 + .../ignite/client/impl/ClientCacheFlagsCodecTest.java | 4 ++-- .../ignite/client/impl/ClientComputeImplSelfTest.java | 2 +- .../apache/ignite/client/impl/ClientDataImplSelfTest.java | 2 +- .../ignite/client/impl/ClientFutureAdapterSelfTest.java | 4 ++-- .../ignite/client/impl/ClientPartitionAffinitySelfTest.java | 2 +- .../client/impl/ClientPropertiesConfigurationSelfTest.java | 4 ++-- .../integration/ClientAbstractConnectivitySelfTest.java | 2 +- .../client/integration/ClientAbstractMultiNodeSelfTest.java | 2 +- .../ignite/client/integration/ClientAbstractSelfTest.java | 2 +- .../client/integration/ClientPreferDirectSelfTest.java | 2 +- .../client/integration/ClientTcpConnectivitySelfTest.java | 2 +- .../integration/ClientTcpDirectMultiNodeSelfTest.java | 2 +- .../ignite/client/integration/ClientTcpDirectSelfTest.java | 2 +- .../client/integration/ClientTcpMultiNodeSelfTest.java | 2 +- .../apache/ignite/client/integration/ClientTcpSelfTest.java | 2 +- .../integration/ClientTcpSslDirectMultiNodeSelfTest.java | 2 +- .../client/integration/ClientTcpSslDirectSelfTest.java | 2 +- .../client/integration/ClientTcpSslMultiNodeSelfTest.java | 2 +- .../ignite/client/integration/ClientTcpSslSelfTest.java | 2 +- .../integration/ClientTcpUnreachableMultiNodeSelfTest.java | 2 +- .../ignite/client/router/ClientFailedInitSelfTest.java | 4 ++-- .../ignite/client/router/TcpRouterAbstractSelfTest.java | 2 +- .../ignite/client/router/TcpRouterMultiNodeSelfTest.java | 2 +- .../apache/ignite/internal/TaskEventSubjectIdSelfTest.java | 2 +- .../processors/rest/RestProcessorStartSelfTest.java | 2 +- .../processors/rest/TaskCommandHandlerSelfTest.java | 4 ++-- .../ignite/loadtests/client/ClientCacheBenchmark.java | 2 +- .../ignite/client/balancer/GridClientBalancerAdapter.java | 2 +- .../ignite/client/balancer/GridClientLoadBalancer.java | 2 +- .../ignite/client/balancer/GridClientRandomBalancer.java | 2 +- .../client/balancer/GridClientRoundRobinBalancer.java | 2 +- .../ignite/client/impl/GridClientAbstractProjection.java | 2 +- .../apache/ignite/client/impl/GridClientAndPredicate.java | 2 +- .../apache/ignite/client/impl/GridClientComputeImpl.java | 2 +- .../org/apache/ignite/client/impl/GridClientDataImpl.java | 2 +- .../ignite/client/impl/GridClientDataMetricsAdapter.java | 2 +- .../apache/ignite/client/impl/GridClientFutureAdapter.java | 2 +- .../apache/ignite/client/impl/GridClientFutureCallback.java | 2 +- .../java/org/apache/ignite/client/impl/GridClientImpl.java | 4 ++-- .../org/apache/ignite/client/impl/GridClientNodeImpl.java | 2 +- .../ignite/client/impl/GridClientNodeMetricsAdapter.java | 2 +- .../ignite/client/impl/connection/GridClientConnection.java | 4 ++-- .../client/impl/connection/GridClientConnectionManager.java | 4 ++-- .../impl/connection/GridClientConnectionManagerAdapter.java | 2 +- .../impl/connection/GridClientConnectionManagerOsImpl.java | 2 +- .../impl/connection/GridClientConnectionResetException.java | 2 +- .../client/impl/connection/GridClientNioTcpConnection.java | 4 ++-- .../ignite/client/impl/connection/GridClientTopology.java | 2 +- .../java/org/apache/ignite/client/router/GridTcpRouter.java | 6 ++---- .../ignite/client/router/impl/GridRouterClientImpl.java | 2 +- .../apache/ignite/client/router/impl/GridTcpRouterImpl.java | 2 +- .../client/router/impl/GridTcpRouterNioListenerAdapter.java | 2 +- .../apache/ignite/client/util/GridClientConsistentHash.java | 2 +- .../java/org/apache/ignite/client/util/GridClientUtils.java | 2 +- .../org/apache/ignite/{ => internal}/client/GridClient.java | 2 +- .../client/GridClientAuthenticationException.java | 2 +- .../ignite/{ => internal}/client/GridClientCacheFlag.java | 2 +- .../ignite/{ => internal}/client/GridClientCacheMode.java | 2 +- .../{ => internal}/client/GridClientClosedException.java | 2 +- .../ignite/{ => internal}/client/GridClientCompute.java | 2 +- .../{ => internal}/client/GridClientConfiguration.java | 2 +- .../apache/ignite/{ => internal}/client/GridClientData.java | 2 +- .../{ => internal}/client/GridClientDataAffinity.java | 2 +- .../{ => internal}/client/GridClientDataConfiguration.java | 2 +- .../ignite/{ => internal}/client/GridClientDataMetrics.java | 2 +- .../client/GridClientDisconnectedException.java | 2 +- .../ignite/{ => internal}/client/GridClientException.java | 2 +- .../ignite/{ => internal}/client/GridClientFactory.java | 2 +- .../ignite/{ => internal}/client/GridClientFuture.java | 2 +- .../{ => internal}/client/GridClientFutureListener.java | 2 +- .../client/GridClientFutureTimeoutException.java | 2 +- .../{ => internal}/client/GridClientHandshakeException.java | 2 +- .../apache/ignite/{ => internal}/client/GridClientNode.java | 2 +- .../ignite/{ => internal}/client/GridClientNodeMetrics.java | 2 +- .../{ => internal}/client/GridClientPartitionAffinity.java | 2 +- .../ignite/{ => internal}/client/GridClientPredicate.java | 2 +- .../ignite/{ => internal}/client/GridClientProtocol.java | 2 +- .../{ => internal}/client/GridClientTopologyListener.java | 2 +- .../client/GridServerUnreachableException.java | 2 +- .../java/org/apache/ignite/jdbc/IgniteJdbcConnection.java | 2 +- .../org/apache/ignite/jdbc/IgniteJdbcDatabaseMetadata.java | 2 +- .../java/org/apache/ignite/jdbc/IgniteJdbcResultSet.java | 2 +- .../java/org/apache/ignite/jdbc/IgniteJdbcStatement.java | 2 +- .../ignite/client/hadoop/GridHadoopClientProtocol.java | 2 +- .../client/hadoop/GridHadoopClientProtocolProvider.java | 4 ++-- 94 files changed, 108 insertions(+), 102 deletions(-) rename modules/core/src/main/java/org/apache/ignite/{ => internal}/client/GridClient.java (99%) rename modules/core/src/main/java/org/apache/ignite/{ => internal}/client/GridClientAuthenticationException.java (96%) rename modules/core/src/main/java/org/apache/ignite/{ => internal}/client/GridClientCacheFlag.java (98%) rename modules/core/src/main/java/org/apache/ignite/{ => internal}/client/GridClientCacheMode.java (95%) rename modules/core/src/main/java/org/apache/ignite/{ => internal}/client/GridClientClosedException.java (96%) rename modules/core/src/main/java/org/apache/ignite/{ => internal}/client/GridClientCompute.java (99%) rename modules/core/src/main/java/org/apache/ignite/{ => internal}/client/GridClientConfiguration.java (99%) rename modules/core/src/main/java/org/apache/ignite/{ => internal}/client/GridClientData.java (99%) rename modules/core/src/main/java/org/apache/ignite/{ => internal}/client/GridClientDataAffinity.java (97%) rename modules/core/src/main/java/org/apache/ignite/{ => internal}/client/GridClientDataConfiguration.java (98%) rename modules/core/src/main/java/org/apache/ignite/{ => internal}/client/GridClientDataMetrics.java (98%) rename modules/core/src/main/java/org/apache/ignite/{ => internal}/client/GridClientDisconnectedException.java (96%) rename modules/core/src/main/java/org/apache/ignite/{ => internal}/client/GridClientException.java (98%) rename modules/core/src/main/java/org/apache/ignite/{ => internal}/client/GridClientFactory.java (99%) rename modules/core/src/main/java/org/apache/ignite/{ => internal}/client/GridClientFuture.java (98%) rename modules/core/src/main/java/org/apache/ignite/{ => internal}/client/GridClientFutureListener.java (96%) rename modules/core/src/main/java/org/apache/ignite/{ => internal}/client/GridClientFutureTimeoutException.java (97%) rename modules/core/src/main/java/org/apache/ignite/{ => internal}/client/GridClientHandshakeException.java (97%) rename modules/core/src/main/java/org/apache/ignite/{ => internal}/client/GridClientNode.java (99%) rename modules/core/src/main/java/org/apache/ignite/{ => internal}/client/GridClientNodeMetrics.java (99%) rename modules/core/src/main/java/org/apache/ignite/{ => internal}/client/GridClientPartitionAffinity.java (99%) rename modules/core/src/main/java/org/apache/ignite/{ => internal}/client/GridClientPredicate.java (97%) rename modules/core/src/main/java/org/apache/ignite/{ => internal}/client/GridClientProtocol.java (96%) rename modules/core/src/main/java/org/apache/ignite/{ => internal}/client/GridClientTopologyListener.java (97%) rename modules/core/src/main/java/org/apache/ignite/{ => internal}/client/GridServerUnreachableException.java (97%) diff --git a/modules/clients/config/grid-client-spring-config.xml b/modules/clients/config/grid-client-spring-config.xml index 9270f9644edca..473d9203c7e8c 100644 --- a/modules/clients/config/grid-client-spring-config.xml +++ b/modules/clients/config/grid-client-spring-config.xml @@ -39,14 +39,14 @@ - + - + - + diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java index e72e684ed989c..09aee47395923 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java @@ -24,6 +24,7 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.apache.ignite.client.balancer.*; diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientDefaultCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientDefaultCacheSelfTest.java index 0161c163f94d9..01a4a10bf484a 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientDefaultCacheSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientDefaultCacheSelfTest.java @@ -18,6 +18,7 @@ package org.apache.ignite.client; import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -27,7 +28,7 @@ import java.util.*; -import static org.apache.ignite.client.GridClientProtocol.*; +import static org.apache.ignite.internal.client.GridClientProtocol.*; import static org.apache.ignite.IgniteSystemProperties.*; /** diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientReconnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientReconnectionSelfTest.java index 7e08b96312f65..04343ec03b783 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientReconnectionSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientReconnectionSelfTest.java @@ -19,6 +19,7 @@ import org.apache.ignite.*; import org.apache.ignite.client.impl.connection.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.testframework.junits.common.*; diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpMultiThreadedSelfTest.java index cda5a62265edd..953e6a7eb10c2 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpMultiThreadedSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpMultiThreadedSelfTest.java @@ -18,6 +18,7 @@ package org.apache.ignite.client; import org.apache.ignite.client.ssl.*; +import org.apache.ignite.internal.client.*; /** * Runs multi-threaded tests on tcp binary protocol (ssl is disabled). diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpSslAuthenticationSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpSslAuthenticationSelfTest.java index 535e4c19a0088..3c22e01e3bacd 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpSslAuthenticationSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpSslAuthenticationSelfTest.java @@ -21,6 +21,7 @@ import org.apache.ignite.client.balancer.*; import org.apache.ignite.client.impl.*; import org.apache.ignite.client.ssl.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.*; diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpSslMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpSslMultiThreadedSelfTest.java index 973982c55c068..45f2e8a4542dd 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpSslMultiThreadedSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpSslMultiThreadedSelfTest.java @@ -18,6 +18,7 @@ package org.apache.ignite.client; import org.apache.ignite.client.ssl.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.testframework.*; /** diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java index f56b136373aee..e11dbfd3d8d23 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java @@ -18,6 +18,7 @@ package org.apache.ignite.client; import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.testframework.junits.common.*; import java.util.*; diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java index df61aecbb6dd6..8c02c01fa4e5d 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java @@ -19,6 +19,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; diff --git a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientCacheFlagsCodecTest.java b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientCacheFlagsCodecTest.java index b187c02402eb6..edbe92c973c0f 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientCacheFlagsCodecTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientCacheFlagsCodecTest.java @@ -18,15 +18,15 @@ package org.apache.ignite.client.impl; import junit.framework.*; -import org.apache.ignite.client.*; import org.apache.ignite.client.impl.connection.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.rest.handlers.cache.*; import org.apache.ignite.internal.util.typedef.*; import java.util.*; -import static org.apache.ignite.client.GridClientCacheFlag.*; +import static org.apache.ignite.internal.client.GridClientCacheFlag.*; /** * Tests conversions between GridClientCacheFlag and CacheFlag. diff --git a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientComputeImplSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientComputeImplSelfTest.java index bb763ba3391d4..f46fc87da2c6d 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientComputeImplSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientComputeImplSelfTest.java @@ -17,7 +17,7 @@ package org.apache.ignite.client.impl; -import org.apache.ignite.client.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.testframework.junits.common.*; import java.util.*; diff --git a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientDataImplSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientDataImplSelfTest.java index c40d5eee711ca..a4876cceaeb7c 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientDataImplSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientDataImplSelfTest.java @@ -17,7 +17,7 @@ package org.apache.ignite.client.impl; -import org.apache.ignite.client.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.testframework.junits.common.*; import java.util.concurrent.*; diff --git a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientFutureAdapterSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientFutureAdapterSelfTest.java index 24b9e31be0644..ca9b70690dc1a 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientFutureAdapterSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientFutureAdapterSelfTest.java @@ -17,7 +17,7 @@ package org.apache.ignite.client.impl; -import org.apache.ignite.client.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.testframework.junits.common.*; import java.util.*; @@ -46,7 +46,7 @@ public void testFinished() { /** * Test chained futures behaviour. * - * @throws GridClientException On any exception. + * @throws org.apache.ignite.internal.client.GridClientException On any exception. */ public void testChains() throws GridClientException { // Synchronous notifications. diff --git a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPartitionAffinitySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPartitionAffinitySelfTest.java index 35e7c5e0b93ac..88b5e60420126 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPartitionAffinitySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPartitionAffinitySelfTest.java @@ -20,7 +20,7 @@ import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cache.affinity.consistenthash.*; import org.apache.ignite.cluster.*; -import org.apache.ignite.client.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.processors.affinity.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.testframework.*; diff --git a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java index 7b903faeb7753..bf6296dfbed80 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java @@ -18,8 +18,8 @@ package org.apache.ignite.client.impl; import org.apache.commons.io.*; -import org.apache.ignite.client.*; import org.apache.ignite.client.balancer.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.junits.common.*; @@ -29,7 +29,7 @@ import java.net.*; import java.util.*; -import static org.apache.ignite.client.GridClientConfiguration.*; +import static org.apache.ignite.internal.client.GridClientConfiguration.*; /** * Properties-based configuration self test. diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractConnectivitySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractConnectivitySelfTest.java index 7ac61c3ea5c96..4392256dd60c4 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractConnectivitySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractConnectivitySelfTest.java @@ -18,8 +18,8 @@ package org.apache.ignite.client.integration; import org.apache.ignite.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.lang.*; -import org.apache.ignite.client.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.*; diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java index d1f33194015b1..721020c13463c 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java @@ -23,6 +23,7 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.distributed.*; import org.apache.ignite.internal.processors.cache.version.*; @@ -33,7 +34,6 @@ import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.apache.ignite.client.*; import org.apache.ignite.client.balancer.*; import org.apache.ignite.client.ssl.*; import org.apache.ignite.internal.managers.communication.*; diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java index a0a276854b9e3..bf1ce901b4c36 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java @@ -26,12 +26,12 @@ import org.apache.ignite.cache.store.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.spi.swapspace.file.*; -import org.apache.ignite.client.*; import org.apache.ignite.client.ssl.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientPreferDirectSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientPreferDirectSelfTest.java index 79ccc5bde525b..f11d3616205ef 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientPreferDirectSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientPreferDirectSelfTest.java @@ -20,8 +20,8 @@ import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.resources.*; -import org.apache.ignite.client.*; import org.apache.ignite.client.balancer.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpConnectivitySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpConnectivitySelfTest.java index a894f7448778c..7b991ab195c7f 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpConnectivitySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpConnectivitySelfTest.java @@ -19,8 +19,8 @@ import org.apache.ignite.*; import org.apache.ignite.configuration.*; -import org.apache.ignite.client.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.util.typedef.*; import org.jetbrains.annotations.*; diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpDirectMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpDirectMultiNodeSelfTest.java index 0ec2ef4118e58..68f7f920593f2 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpDirectMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpDirectMultiNodeSelfTest.java @@ -17,7 +17,7 @@ package org.apache.ignite.client.integration; -import org.apache.ignite.client.*; +import org.apache.ignite.internal.client.*; import java.util.*; diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpDirectSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpDirectSelfTest.java index 22136a06de561..00cb9a4a18611 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpDirectSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpDirectSelfTest.java @@ -17,8 +17,8 @@ package org.apache.ignite.client.integration; -import org.apache.ignite.client.*; import org.apache.ignite.client.ssl.*; +import org.apache.ignite.internal.client.*; import java.util.*; diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpMultiNodeSelfTest.java index 286a1f3575514..d65d5a17b8f42 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpMultiNodeSelfTest.java @@ -17,7 +17,7 @@ package org.apache.ignite.client.integration; -import org.apache.ignite.client.*; +import org.apache.ignite.internal.client.*; /** * Test for TCP binary rest protocol. diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSelfTest.java index 8c13c4c27397f..29ede90e9dae9 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSelfTest.java @@ -17,8 +17,8 @@ package org.apache.ignite.client.integration; -import org.apache.ignite.client.*; import org.apache.ignite.client.ssl.*; +import org.apache.ignite.internal.client.*; /** * Tests TCP protocol. diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslDirectMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslDirectMultiNodeSelfTest.java index e724d2708457f..4c9c6c2c1aa45 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslDirectMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslDirectMultiNodeSelfTest.java @@ -17,8 +17,8 @@ package org.apache.ignite.client.integration; -import org.apache.ignite.client.*; import org.apache.ignite.client.ssl.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.testframework.*; import java.util.*; diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslDirectSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslDirectSelfTest.java index 883244566a98e..404bd5104f429 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslDirectSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslDirectSelfTest.java @@ -17,8 +17,8 @@ package org.apache.ignite.client.integration; -import org.apache.ignite.client.*; import org.apache.ignite.client.ssl.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.testframework.*; import java.util.*; diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslMultiNodeSelfTest.java index 7f64c7e23c5db..9b4b26f140ed1 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslMultiNodeSelfTest.java @@ -17,8 +17,8 @@ package org.apache.ignite.client.integration; -import org.apache.ignite.client.*; import org.apache.ignite.client.ssl.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.testframework.*; /** diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslSelfTest.java index f99cd69508272..e94e928d969c2 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslSelfTest.java @@ -17,8 +17,8 @@ package org.apache.ignite.client.integration; -import org.apache.ignite.client.*; import org.apache.ignite.client.ssl.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.testframework.*; /** diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpUnreachableMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpUnreachableMultiNodeSelfTest.java index 1b54692c2a2f8..c5fbd076d2005 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpUnreachableMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpUnreachableMultiNodeSelfTest.java @@ -17,8 +17,8 @@ package org.apache.ignite.client.integration; -import org.apache.ignite.client.*; import org.apache.ignite.client.balancer.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.util.typedef.*; import java.net.*; diff --git a/modules/clients/src/test/java/org/apache/ignite/client/router/ClientFailedInitSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/router/ClientFailedInitSelfTest.java index d33bc29c97787..fe635dd33231e 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/router/ClientFailedInitSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/router/ClientFailedInitSelfTest.java @@ -20,8 +20,8 @@ import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; -import org.apache.ignite.client.*; import org.apache.ignite.client.impl.connection.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -30,7 +30,7 @@ import java.util.*; -import static org.apache.ignite.client.GridClientProtocol.*; +import static org.apache.ignite.internal.client.GridClientProtocol.*; import static org.apache.ignite.client.integration.ClientAbstractSelfTest.*; import static org.apache.ignite.IgniteSystemProperties.*; diff --git a/modules/clients/src/test/java/org/apache/ignite/client/router/TcpRouterAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/router/TcpRouterAbstractSelfTest.java index 3fb54ac758fc1..3e835cbf42f15 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/router/TcpRouterAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/router/TcpRouterAbstractSelfTest.java @@ -18,8 +18,8 @@ package org.apache.ignite.client.router; import org.apache.ignite.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.logger.log4j.*; -import org.apache.ignite.client.*; import org.apache.ignite.client.integration.*; import org.apache.ignite.client.router.impl.*; import org.apache.ignite.internal.util.typedef.*; diff --git a/modules/clients/src/test/java/org/apache/ignite/client/router/TcpRouterMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/router/TcpRouterMultiNodeSelfTest.java index e1c076eeee51f..82c87243b6d86 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/router/TcpRouterMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/router/TcpRouterMultiNodeSelfTest.java @@ -18,8 +18,8 @@ package org.apache.ignite.client.router; import org.apache.ignite.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.logger.log4j.*; -import org.apache.ignite.client.*; import org.apache.ignite.client.integration.*; import org.apache.ignite.client.router.impl.*; diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java index e04884630a6e7..d1d21d7da56bb 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java @@ -21,8 +21,8 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.lang.*; -import org.apache.ignite.client.*; import org.apache.ignite.testframework.*; import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java index efae9239b1a48..8db093a378566 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java @@ -19,9 +19,9 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.*; -import org.apache.ignite.client.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java index 325cdb66f9efa..b89956627d33a 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java @@ -21,8 +21,8 @@ import org.apache.ignite.cache.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; -import org.apache.ignite.client.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.processors.rest.handlers.*; import org.apache.ignite.internal.processors.rest.handlers.task.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -36,7 +36,7 @@ import java.util.*; -import static org.apache.ignite.client.GridClientProtocol.*; +import static org.apache.ignite.internal.client.GridClientProtocol.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; diff --git a/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientCacheBenchmark.java b/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientCacheBenchmark.java index 35c03d4c08086..e1945d6d23b3e 100644 --- a/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientCacheBenchmark.java +++ b/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientCacheBenchmark.java @@ -18,7 +18,7 @@ package org.apache.ignite.loadtests.client; import org.apache.ignite.*; -import org.apache.ignite.client.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/balancer/GridClientBalancerAdapter.java b/modules/core/src/main/java/org/apache/ignite/client/balancer/GridClientBalancerAdapter.java index f854febc14faf..7edffe9540ed8 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/balancer/GridClientBalancerAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/client/balancer/GridClientBalancerAdapter.java @@ -17,8 +17,8 @@ package org.apache.ignite.client.balancer; +import org.apache.ignite.internal.client.*; import org.apache.ignite.lang.*; -import org.apache.ignite.client.*; import org.apache.ignite.internal.util.typedef.*; import java.util.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/balancer/GridClientLoadBalancer.java b/modules/core/src/main/java/org/apache/ignite/client/balancer/GridClientLoadBalancer.java index 9407a9f19d9cd..06d110446029c 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/balancer/GridClientLoadBalancer.java +++ b/modules/core/src/main/java/org/apache/ignite/client/balancer/GridClientLoadBalancer.java @@ -17,7 +17,7 @@ package org.apache.ignite.client.balancer; -import org.apache.ignite.client.*; +import org.apache.ignite.internal.client.*; import java.util.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/balancer/GridClientRandomBalancer.java b/modules/core/src/main/java/org/apache/ignite/client/balancer/GridClientRandomBalancer.java index 640c1ec522213..221e2e9347ca5 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/balancer/GridClientRandomBalancer.java +++ b/modules/core/src/main/java/org/apache/ignite/client/balancer/GridClientRandomBalancer.java @@ -17,7 +17,7 @@ package org.apache.ignite.client.balancer; -import org.apache.ignite.client.*; +import org.apache.ignite.internal.client.*; import java.util.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/balancer/GridClientRoundRobinBalancer.java b/modules/core/src/main/java/org/apache/ignite/client/balancer/GridClientRoundRobinBalancer.java index 080941e2b7a52..3eb0dc6615fad 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/balancer/GridClientRoundRobinBalancer.java +++ b/modules/core/src/main/java/org/apache/ignite/client/balancer/GridClientRoundRobinBalancer.java @@ -17,7 +17,7 @@ package org.apache.ignite.client.balancer; -import org.apache.ignite.client.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.util.typedef.internal.*; import java.util.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientAbstractProjection.java b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientAbstractProjection.java index 7f209d71e9b13..6a897dea79946 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientAbstractProjection.java +++ b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientAbstractProjection.java @@ -18,10 +18,10 @@ package org.apache.ignite.client.impl; import org.apache.ignite.*; -import org.apache.ignite.client.*; import org.apache.ignite.client.balancer.*; import org.apache.ignite.client.impl.connection.*; import org.apache.ignite.client.util.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientAndPredicate.java b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientAndPredicate.java index 9ab75493e6a6f..cc7492091974e 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientAndPredicate.java +++ b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientAndPredicate.java @@ -17,7 +17,7 @@ package org.apache.ignite.client.impl; -import org.apache.ignite.client.*; +import org.apache.ignite.internal.client.*; /** * AND predicate. Passes if and only if both provided filters accept the node. diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientComputeImpl.java b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientComputeImpl.java index 83fe8932903a1..921b33f45ea22 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientComputeImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientComputeImpl.java @@ -17,9 +17,9 @@ package org.apache.ignite.client.impl; -import org.apache.ignite.client.*; import org.apache.ignite.client.balancer.*; import org.apache.ignite.client.impl.connection.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientDataImpl.java b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientDataImpl.java index 89af3b487f744..3abd9cf2d3e6f 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientDataImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientDataImpl.java @@ -17,10 +17,10 @@ package org.apache.ignite.client.impl; -import org.apache.ignite.client.*; import org.apache.ignite.client.balancer.*; import org.apache.ignite.client.impl.connection.*; import org.apache.ignite.client.util.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.util.typedef.internal.*; import java.util.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientDataMetricsAdapter.java b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientDataMetricsAdapter.java index 807f94ad11208..449bffce47ce2 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientDataMetricsAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientDataMetricsAdapter.java @@ -17,7 +17,7 @@ package org.apache.ignite.client.impl; -import org.apache.ignite.client.*; +import org.apache.ignite.internal.client.*; /** * Adapter for cache metrics. diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientFutureAdapter.java index 8ee855ed3fd4e..bf4a78833f056 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientFutureAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientFutureAdapter.java @@ -17,7 +17,7 @@ package org.apache.ignite.client.impl; -import org.apache.ignite.client.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientFutureCallback.java b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientFutureCallback.java index 081e58b8b0d01..b86ff5d55bf6b 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientFutureCallback.java +++ b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientFutureCallback.java @@ -17,7 +17,7 @@ package org.apache.ignite.client.impl; -import org.apache.ignite.client.*; +import org.apache.ignite.internal.client.*; /** * Future callback will be notified, when listened future finishes (both succeed or failed). diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientImpl.java b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientImpl.java index 027f18f8869a1..20e66ddcb6556 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientImpl.java @@ -18,10 +18,10 @@ package org.apache.ignite.client.impl; import org.apache.ignite.*; -import org.apache.ignite.client.*; import org.apache.ignite.client.balancer.*; import org.apache.ignite.client.impl.connection.*; import org.apache.ignite.client.ssl.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; @@ -103,7 +103,7 @@ public class GridClientImpl implements GridClient { * * @param id Client identifier. * @param cfg0 Client configuration. - * @throws GridClientException If client configuration is incorrect. + * @throws org.apache.ignite.internal.client.GridClientException If client configuration is incorrect. * @throws GridServerUnreachableException If none of the servers specified in configuration can * be reached. */ diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientNodeImpl.java b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientNodeImpl.java index 93c36d6cd1a24..b0bf1cb971153 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientNodeImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientNodeImpl.java @@ -17,7 +17,7 @@ package org.apache.ignite.client.impl; -import org.apache.ignite.client.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientNodeMetricsAdapter.java b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientNodeMetricsAdapter.java index 226a5ac237bd3..a4e4ba3245625 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientNodeMetricsAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientNodeMetricsAdapter.java @@ -17,7 +17,7 @@ package org.apache.ignite.client.impl; -import org.apache.ignite.client.*; +import org.apache.ignite.internal.client.*; /** * Node metrics adapter. diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientConnection.java b/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientConnection.java index a4a4ec3beda0c..a5ce91d827969 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientConnection.java +++ b/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientConnection.java @@ -17,8 +17,8 @@ package org.apache.ignite.client.impl.connection; -import org.apache.ignite.client.*; import org.apache.ignite.client.impl.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.util.typedef.*; import org.jetbrains.annotations.*; @@ -172,7 +172,7 @@ public GridClientFutureAdapter cacheGet(String cacheName, final K key, * @param destNodeId Destination node ID. * @return Whether entry was actually removed. * @throws GridClientConnectionResetException In case of error. - * @throws GridClientClosedException If client was manually closed before request was sent over network. + * @throws org.apache.ignite.internal.client.GridClientClosedException If client was manually closed before request was sent over network. */ public abstract GridClientFutureAdapter cacheRemove(String cacheName, K key, Set flags, UUID destNodeId) diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientConnectionManager.java b/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientConnectionManager.java index f3569a81ce5cc..2e0b535b033de 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientConnectionManager.java +++ b/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientConnectionManager.java @@ -17,7 +17,7 @@ package org.apache.ignite.client.impl.connection; -import org.apache.ignite.client.*; +import org.apache.ignite.internal.client.*; import org.jetbrains.annotations.*; import java.net.*; @@ -45,7 +45,7 @@ public interface GridClientConnectionManager { * @throws GridServerUnreachableException If connection can't be established. * @throws InterruptedException If manager was interrupted while waiting for connection * to be established. - * @throws GridClientClosedException If connection manager has been closed. + * @throws org.apache.ignite.internal.client.GridClientClosedException If connection manager has been closed. */ public GridClientConnection connection(GridClientNode node) throws GridServerUnreachableException, GridClientClosedException, InterruptedException; diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientConnectionManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientConnectionManagerAdapter.java index 8c070384c73cd..46e28b977158b 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientConnectionManagerAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientConnectionManagerAdapter.java @@ -18,8 +18,8 @@ package org.apache.ignite.client.impl.connection; import org.apache.ignite.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.logger.java.*; -import org.apache.ignite.client.*; import org.apache.ignite.client.impl.*; import org.apache.ignite.client.util.*; import org.apache.ignite.internal.processors.rest.client.message.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientConnectionManagerOsImpl.java b/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientConnectionManagerOsImpl.java index f2d4506321585..968bee6dde1b2 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientConnectionManagerOsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientConnectionManagerOsImpl.java @@ -17,7 +17,7 @@ package org.apache.ignite.client.impl.connection; -import org.apache.ignite.client.*; +import org.apache.ignite.internal.client.*; import javax.net.ssl.*; import java.net.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientConnectionResetException.java b/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientConnectionResetException.java index a9074a125ce28..d7cdb16645be1 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientConnectionResetException.java +++ b/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientConnectionResetException.java @@ -17,7 +17,7 @@ package org.apache.ignite.client.impl.connection; -import org.apache.ignite.client.*; +import org.apache.ignite.internal.client.*; /** * This exception is thrown when ongoing packet should be sent, but network connection is broken. diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientNioTcpConnection.java b/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientNioTcpConnection.java index 51da3d7571015..e8fcb06a91f74 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientNioTcpConnection.java +++ b/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientNioTcpConnection.java @@ -18,11 +18,11 @@ package org.apache.ignite.client.impl.connection; import org.apache.ignite.*; -import org.apache.ignite.client.*; import org.apache.ignite.client.impl.*; import org.apache.ignite.client.marshaller.*; import org.apache.ignite.client.marshaller.jdk.*; import org.apache.ignite.client.marshaller.optimized.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.processors.rest.client.message.*; import org.apache.ignite.internal.util.nio.*; import org.apache.ignite.internal.util.nio.ssl.*; @@ -40,7 +40,7 @@ import java.util.concurrent.atomic.*; import java.util.logging.*; -import static org.apache.ignite.client.GridClientCacheFlag.*; +import static org.apache.ignite.internal.client.GridClientCacheFlag.*; import static org.apache.ignite.client.impl.connection.GridClientConnectionCloseReason.*; import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientTopology.java b/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientTopology.java index ed81783bb9378..07cb85500bd82 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientTopology.java +++ b/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientTopology.java @@ -17,9 +17,9 @@ package org.apache.ignite.client.impl.connection; -import org.apache.ignite.client.*; import org.apache.ignite.client.impl.*; import org.apache.ignite.client.util.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/router/GridTcpRouter.java b/modules/core/src/main/java/org/apache/ignite/client/router/GridTcpRouter.java index fdc5f05101085..cae08619ef9a5 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/router/GridTcpRouter.java +++ b/modules/core/src/main/java/org/apache/ignite/client/router/GridTcpRouter.java @@ -17,8 +17,6 @@ package org.apache.ignite.client.router; -import org.apache.ignite.client.*; - import java.util.*; /** @@ -45,8 +43,8 @@ * *

* Note that clients should be specifically configured in order to use router. - * Please refer to {@link GridClientConfiguration#getServers()} and - * {@link GridClientConfiguration#getRouters()} documentation for more details. + * Please refer to {@link org.apache.ignite.internal.client.GridClientConfiguration#getServers()} and + * {@link org.apache.ignite.internal.client.GridClientConfiguration#getRouters()} documentation for more details. *

* Instances of this interface are managed through {@link GridRouterFactory}. * diff --git a/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridRouterClientImpl.java b/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridRouterClientImpl.java index 0d7f74d751f7f..abe9fe18c51cb 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridRouterClientImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridRouterClientImpl.java @@ -17,10 +17,10 @@ package org.apache.ignite.client.router.impl; -import org.apache.ignite.client.*; import org.apache.ignite.client.impl.*; import org.apache.ignite.client.impl.connection.*; import org.apache.ignite.client.router.*; +import org.apache.ignite.internal.client.*; import org.jdk8.backport.*; import org.jetbrains.annotations.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridTcpRouterImpl.java b/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridTcpRouterImpl.java index e0539b336beee..aaffeaa68f4ab 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridTcpRouterImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridTcpRouterImpl.java @@ -18,9 +18,9 @@ package org.apache.ignite.client.router.impl; import org.apache.ignite.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.lifecycle.*; import org.apache.ignite.logger.java.*; -import org.apache.ignite.client.*; import org.apache.ignite.client.router.*; import org.apache.ignite.client.ssl.*; import org.apache.ignite.internal.processors.rest.client.message.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridTcpRouterNioListenerAdapter.java b/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridTcpRouterNioListenerAdapter.java index 0b56bf246fca0..805bded26cbc4 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridTcpRouterNioListenerAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridTcpRouterNioListenerAdapter.java @@ -18,10 +18,10 @@ package org.apache.ignite.client.router.impl; import org.apache.ignite.*; -import org.apache.ignite.client.*; import org.apache.ignite.client.marshaller.*; import org.apache.ignite.client.marshaller.jdk.*; import org.apache.ignite.client.marshaller.optimized.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.processors.rest.client.message.*; import org.apache.ignite.internal.util.nio.*; import org.apache.ignite.internal.util.typedef.internal.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/util/GridClientConsistentHash.java b/modules/core/src/main/java/org/apache/ignite/client/util/GridClientConsistentHash.java index 21eac54ad0413..03ad5b30836c7 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/util/GridClientConsistentHash.java +++ b/modules/core/src/main/java/org/apache/ignite/client/util/GridClientConsistentHash.java @@ -17,7 +17,7 @@ package org.apache.ignite.client.util; -import org.apache.ignite.client.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/util/GridClientUtils.java b/modules/core/src/main/java/org/apache/ignite/client/util/GridClientUtils.java index 3a5cdfb571c7b..b8e202ae14ae3 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/util/GridClientUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/client/util/GridClientUtils.java @@ -17,7 +17,7 @@ package org.apache.ignite.client.util; -import org.apache.ignite.client.*; +import org.apache.ignite.internal.client.*; import org.jetbrains.annotations.*; import java.io.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/GridClient.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClient.java similarity index 99% rename from modules/core/src/main/java/org/apache/ignite/client/GridClient.java rename to modules/core/src/main/java/org/apache/ignite/internal/client/GridClient.java index bfe169ce0a03d..5f02abdf3a8a0 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/GridClient.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClient.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.client; +package org.apache.ignite.internal.client; import org.apache.ignite.client.balancer.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/GridClientAuthenticationException.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientAuthenticationException.java similarity index 96% rename from modules/core/src/main/java/org/apache/ignite/client/GridClientAuthenticationException.java rename to modules/core/src/main/java/org/apache/ignite/internal/client/GridClientAuthenticationException.java index 53d1ffcc8b09a..cd46d8b9b3b9b 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/GridClientAuthenticationException.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientAuthenticationException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.client; +package org.apache.ignite.internal.client; /** * Exception that represents client authentication failure. diff --git a/modules/core/src/main/java/org/apache/ignite/client/GridClientCacheFlag.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java similarity index 98% rename from modules/core/src/main/java/org/apache/ignite/client/GridClientCacheFlag.java rename to modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java index 9cf307ed54d39..48982b0eef856 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/GridClientCacheFlag.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.client; +package org.apache.ignite.internal.client; import java.util.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/GridClientCacheMode.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheMode.java similarity index 95% rename from modules/core/src/main/java/org/apache/ignite/client/GridClientCacheMode.java rename to modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheMode.java index ea8d640641937..b4c0022e564db 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/GridClientCacheMode.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheMode.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.client; +package org.apache.ignite.internal.client; /** * Cache type on remote node. diff --git a/modules/core/src/main/java/org/apache/ignite/client/GridClientClosedException.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientClosedException.java similarity index 96% rename from modules/core/src/main/java/org/apache/ignite/client/GridClientClosedException.java rename to modules/core/src/main/java/org/apache/ignite/internal/client/GridClientClosedException.java index c9ba20badb94a..ed0095e1caa61 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/GridClientClosedException.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientClosedException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.client; +package org.apache.ignite.internal.client; /** * This exception is thrown whenever an attempt is made to use a closed client. diff --git a/modules/core/src/main/java/org/apache/ignite/client/GridClientCompute.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java similarity index 99% rename from modules/core/src/main/java/org/apache/ignite/client/GridClientCompute.java rename to modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java index 6e9033f36c0de..7b86c241fd788 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/GridClientCompute.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.client; +package org.apache.ignite.internal.client; import org.apache.ignite.client.balancer.*; import org.jetbrains.annotations.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/GridClientConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java similarity index 99% rename from modules/core/src/main/java/org/apache/ignite/client/GridClientConfiguration.java rename to modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java index 4c559f94026ec..c9d57f0f55818 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/GridClientConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.client; +package org.apache.ignite.internal.client; import org.apache.ignite.portables.*; import org.apache.ignite.client.balancer.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/GridClientData.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientData.java similarity index 99% rename from modules/core/src/main/java/org/apache/ignite/client/GridClientData.java rename to modules/core/src/main/java/org/apache/ignite/internal/client/GridClientData.java index 073e08d99aac6..79d5c5c8ea959 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/GridClientData.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientData.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.client; +package org.apache.ignite.internal.client; import java.util.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/GridClientDataAffinity.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataAffinity.java similarity index 97% rename from modules/core/src/main/java/org/apache/ignite/client/GridClientDataAffinity.java rename to modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataAffinity.java index a56636da37056..53a840fed1009 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/GridClientDataAffinity.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataAffinity.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.client; +package org.apache.ignite.internal.client; import java.util.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/GridClientDataConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataConfiguration.java similarity index 98% rename from modules/core/src/main/java/org/apache/ignite/client/GridClientDataConfiguration.java rename to modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataConfiguration.java index 896f0f17ed19d..bc3b9ca73a383 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/GridClientDataConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.client; +package org.apache.ignite.internal.client; import org.apache.ignite.client.balancer.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/GridClientDataMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataMetrics.java similarity index 98% rename from modules/core/src/main/java/org/apache/ignite/client/GridClientDataMetrics.java rename to modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataMetrics.java index 74b3f2f451503..9d2affaf00f80 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/GridClientDataMetrics.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataMetrics.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.client; +package org.apache.ignite.internal.client; import java.io.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/GridClientDisconnectedException.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDisconnectedException.java similarity index 96% rename from modules/core/src/main/java/org/apache/ignite/client/GridClientDisconnectedException.java rename to modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDisconnectedException.java index 561f8f0d5b021..124f1efb7bc1d 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/GridClientDisconnectedException.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDisconnectedException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.client; +package org.apache.ignite.internal.client; /** * This exception is thrown when client has no Grid topology and (probably temporary) can't obtain it. diff --git a/modules/core/src/main/java/org/apache/ignite/client/GridClientException.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientException.java similarity index 98% rename from modules/core/src/main/java/org/apache/ignite/client/GridClientException.java rename to modules/core/src/main/java/org/apache/ignite/internal/client/GridClientException.java index e754eca29a13c..a27bff832bc5f 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/GridClientException.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.client; +package org.apache.ignite.internal.client; import org.apache.ignite.internal.util.typedef.*; import org.jetbrains.annotations.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/GridClientFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFactory.java similarity index 99% rename from modules/core/src/main/java/org/apache/ignite/client/GridClientFactory.java rename to modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFactory.java index 647155e018d8c..4b7f047f0c001 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/GridClientFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.client; +package org.apache.ignite.internal.client; import org.apache.ignite.client.impl.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/GridClientFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFuture.java similarity index 98% rename from modules/core/src/main/java/org/apache/ignite/client/GridClientFuture.java rename to modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFuture.java index 99eb0ea94d6ae..3ffb37e108df8 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/GridClientFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFuture.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.client; +package org.apache.ignite.internal.client; import java.util.concurrent.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/GridClientFutureListener.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFutureListener.java similarity index 96% rename from modules/core/src/main/java/org/apache/ignite/client/GridClientFutureListener.java rename to modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFutureListener.java index 3d149a51c949c..7314fbd8a4afa 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/GridClientFutureListener.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFutureListener.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.client; +package org.apache.ignite.internal.client; /** * Listener interface for {@link GridClientFuture}. diff --git a/modules/core/src/main/java/org/apache/ignite/client/GridClientFutureTimeoutException.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFutureTimeoutException.java similarity index 97% rename from modules/core/src/main/java/org/apache/ignite/client/GridClientFutureTimeoutException.java rename to modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFutureTimeoutException.java index 31171f0376852..a0463679341d0 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/GridClientFutureTimeoutException.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientFutureTimeoutException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.client; +package org.apache.ignite.internal.client; /** * Client future timeout exception is thrown whenever any client waiting is timed out. diff --git a/modules/core/src/main/java/org/apache/ignite/client/GridClientHandshakeException.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientHandshakeException.java similarity index 97% rename from modules/core/src/main/java/org/apache/ignite/client/GridClientHandshakeException.java rename to modules/core/src/main/java/org/apache/ignite/internal/client/GridClientHandshakeException.java index 9af9529f151e3..cefc2872c9a8d 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/GridClientHandshakeException.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientHandshakeException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.client; +package org.apache.ignite.internal.client; /** * This exception is thrown when a client handshake has failed. diff --git a/modules/core/src/main/java/org/apache/ignite/client/GridClientNode.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNode.java similarity index 99% rename from modules/core/src/main/java/org/apache/ignite/client/GridClientNode.java rename to modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNode.java index 7408543787aec..82112da3c2ad1 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/GridClientNode.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNode.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.client; +package org.apache.ignite.internal.client; import org.jetbrains.annotations.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/GridClientNodeMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNodeMetrics.java similarity index 99% rename from modules/core/src/main/java/org/apache/ignite/client/GridClientNodeMetrics.java rename to modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNodeMetrics.java index ab06bced7003a..7859ba5bb69e2 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/GridClientNodeMetrics.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNodeMetrics.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.client; +package org.apache.ignite.internal.client; import java.io.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/GridClientPartitionAffinity.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPartitionAffinity.java similarity index 99% rename from modules/core/src/main/java/org/apache/ignite/client/GridClientPartitionAffinity.java rename to modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPartitionAffinity.java index 661f1dc2385ed..7d209a56b3146 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/GridClientPartitionAffinity.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPartitionAffinity.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.client; +package org.apache.ignite.internal.client; import org.apache.ignite.client.util.*; import org.apache.ignite.internal.util.typedef.internal.*; diff --git a/modules/core/src/main/java/org/apache/ignite/client/GridClientPredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPredicate.java similarity index 97% rename from modules/core/src/main/java/org/apache/ignite/client/GridClientPredicate.java rename to modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPredicate.java index ceff73fc3e746..d28477e172f2f 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/GridClientPredicate.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPredicate.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.client; +package org.apache.ignite.internal.client; /** * Defines predicate construct. Predicate like closure is a first-class function diff --git a/modules/core/src/main/java/org/apache/ignite/client/GridClientProtocol.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientProtocol.java similarity index 96% rename from modules/core/src/main/java/org/apache/ignite/client/GridClientProtocol.java rename to modules/core/src/main/java/org/apache/ignite/internal/client/GridClientProtocol.java index feade92c84091..cab20d8053b40 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/GridClientProtocol.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.client; +package org.apache.ignite.internal.client; /** * Protocol that will be used when client connections are created. diff --git a/modules/core/src/main/java/org/apache/ignite/client/GridClientTopologyListener.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientTopologyListener.java similarity index 97% rename from modules/core/src/main/java/org/apache/ignite/client/GridClientTopologyListener.java rename to modules/core/src/main/java/org/apache/ignite/internal/client/GridClientTopologyListener.java index 8b8191e77072e..3d323022870fa 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/GridClientTopologyListener.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientTopologyListener.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.client; +package org.apache.ignite.internal.client; /** * Listener interface for notifying on nodes joining or leaving remote grid. diff --git a/modules/core/src/main/java/org/apache/ignite/client/GridServerUnreachableException.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridServerUnreachableException.java similarity index 97% rename from modules/core/src/main/java/org/apache/ignite/client/GridServerUnreachableException.java rename to modules/core/src/main/java/org/apache/ignite/internal/client/GridServerUnreachableException.java index 17b2a37557f70..d78742126860d 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/GridServerUnreachableException.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridServerUnreachableException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.client; +package org.apache.ignite.internal.client; /** * Thrown when none of the servers from configuration can be connected within a timeout. diff --git a/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcConnection.java b/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcConnection.java index f5cf63844e40f..ffa0a415b376c 100644 --- a/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcConnection.java +++ b/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcConnection.java @@ -17,7 +17,7 @@ package org.apache.ignite.jdbc; -import org.apache.ignite.client.*; +import org.apache.ignite.internal.client.*; import java.sql.*; import java.util.*; diff --git a/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDatabaseMetadata.java b/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDatabaseMetadata.java index d4b7919cab822..15e485707013e 100644 --- a/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDatabaseMetadata.java +++ b/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDatabaseMetadata.java @@ -17,7 +17,7 @@ package org.apache.ignite.jdbc; -import org.apache.ignite.client.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.jdbc.typedef.*; diff --git a/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcResultSet.java b/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcResultSet.java index 6d839b82cf50b..caf93a47db09a 100644 --- a/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcResultSet.java +++ b/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcResultSet.java @@ -17,7 +17,7 @@ package org.apache.ignite.jdbc; -import org.apache.ignite.client.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.jdbc.typedef.*; diff --git a/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcStatement.java b/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcStatement.java index 027768d460ef8..77dd0057b4825 100644 --- a/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcStatement.java +++ b/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcStatement.java @@ -17,7 +17,7 @@ package org.apache.ignite.jdbc; -import org.apache.ignite.client.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.jdbc.typedef.*; diff --git a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java index 2b286dc6edaa0..349c504aa514d 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java @@ -30,9 +30,9 @@ import org.apache.hadoop.security.authorize.*; import org.apache.hadoop.security.token.*; import org.apache.ignite.*; -import org.apache.ignite.client.*; import org.apache.ignite.client.hadoop.counter.*; import org.apache.ignite.hadoop.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.processors.hadoop.*; import org.apache.ignite.internal.processors.hadoop.proto.*; import org.apache.ignite.internal.util.typedef.internal.*; diff --git a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolProvider.java b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolProvider.java index 29967c727b505..d28c2fbc0bf1d 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolProvider.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolProvider.java @@ -22,8 +22,8 @@ import org.apache.hadoop.mapreduce.protocol.*; import org.apache.ignite.*; import org.apache.ignite.internal.*; -import org.apache.ignite.client.*; import org.apache.ignite.client.marshaller.optimized.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.util.future.*; import org.apache.ignite.internal.util.typedef.*; @@ -32,7 +32,7 @@ import java.util.*; import java.util.concurrent.*; -import static org.apache.ignite.client.GridClientProtocol.*; +import static org.apache.ignite.internal.client.GridClientProtocol.*; import static org.apache.ignite.client.hadoop.GridHadoopClientProtocol.*;