http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTestRestServer.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTestRestServer.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTestRestServer.java index 73a3076..bda1bef 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTestRestServer.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTestRestServer.java @@ -17,19 +17,34 @@ package org.apache.ignite.internal.client; -import org.apache.ignite.*; -import org.apache.ignite.internal.client.marshaller.*; -import org.apache.ignite.internal.client.marshaller.optimized.*; -import org.apache.ignite.internal.processors.rest.client.message.*; -import org.apache.ignite.internal.processors.rest.protocols.tcp.*; -import org.apache.ignite.internal.util.nio.*; -import org.jetbrains.annotations.*; - -import java.net.*; -import java.nio.*; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.nio.ByteOrder; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.UUID; +import java.util.concurrent.Executors; +import java.util.concurrent.atomic.AtomicInteger; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.internal.client.marshaller.GridClientMarshaller; +import org.apache.ignite.internal.client.marshaller.optimized.GridClientOptimizedMarshaller; +import org.apache.ignite.internal.processors.rest.client.message.GridClientAuthenticationRequest; +import org.apache.ignite.internal.processors.rest.client.message.GridClientHandshakeRequest; +import org.apache.ignite.internal.processors.rest.client.message.GridClientHandshakeResponse; +import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage; +import org.apache.ignite.internal.processors.rest.client.message.GridClientNodeBean; +import org.apache.ignite.internal.processors.rest.client.message.GridClientPingPacket; +import org.apache.ignite.internal.processors.rest.client.message.GridClientResponse; +import org.apache.ignite.internal.processors.rest.client.message.GridClientTopologyRequest; +import org.apache.ignite.internal.processors.rest.protocols.tcp.GridTcpRestParser; +import org.apache.ignite.internal.util.nio.GridNioAsyncNotifyFilter; +import org.apache.ignite.internal.util.nio.GridNioCodecFilter; +import org.apache.ignite.internal.util.nio.GridNioServer; +import org.apache.ignite.internal.util.nio.GridNioServerListenerAdapter; +import org.apache.ignite.internal.util.nio.GridNioSession; +import org.jetbrains.annotations.Nullable; /** * @@ -278,4 +293,4 @@ public class ClientTestRestServer { return marsh; } } -} +} \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/HashMapStore.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/HashMapStore.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/HashMapStore.java index 8de945a..867c252 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/HashMapStore.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/HashMapStore.java @@ -17,11 +17,11 @@ package org.apache.ignite.internal.client; -import org.apache.ignite.cache.store.*; -import org.apache.ignite.lang.*; - -import javax.cache.*; -import java.util.*; +import java.util.HashMap; +import java.util.Map; +import javax.cache.Cache; +import org.apache.ignite.cache.store.CacheStoreAdapter; +import org.apache.ignite.lang.IgniteBiInClosure; /** * Simple HashMap based cache store emulation. @@ -50,4 +50,4 @@ public class HashMapStore extends CacheStoreAdapter { @Override public void delete(Object key) { map.remove(key); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/SleepTestTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/SleepTestTask.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/SleepTestTask.java index 2345fe0..87ba73c 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/SleepTestTask.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/SleepTestTask.java @@ -17,11 +17,17 @@ package org.apache.ignite.internal.client; -import org.apache.ignite.compute.*; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.compute.ComputeJobAdapter; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.compute.ComputeJobResultPolicy; +import org.apache.ignite.compute.ComputeTaskSplitAdapter; -import java.util.*; - -import static org.apache.ignite.compute.ComputeJobResultPolicy.*; +import static org.apache.ignite.compute.ComputeJobResultPolicy.FAILOVER; +import static org.apache.ignite.compute.ComputeJobResultPolicy.WAIT; /** * Test task, that sleeps for 10 seconds in split and returns @@ -63,4 +69,4 @@ public class SleepTestTask extends ComputeTaskSplitAdapter<String, Integer> { return WAIT; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/TaskSingleJobSplitAdapter.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/TaskSingleJobSplitAdapter.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/TaskSingleJobSplitAdapter.java index a35d806..3686278 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/TaskSingleJobSplitAdapter.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/TaskSingleJobSplitAdapter.java @@ -17,10 +17,14 @@ package org.apache.ignite.internal.client; -import org.apache.ignite.*; -import org.apache.ignite.compute.*; - -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import org.apache.ignite.IgniteException; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.compute.ComputeJobAdapter; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.compute.ComputeTaskSplitAdapter; /** * Adapter for {@link org.apache.ignite.compute.ComputeTaskSplitAdapter} @@ -67,4 +71,4 @@ public abstract class TaskSingleJobSplitAdapter<T, R> extends ComputeTaskSplitAd * {@link org.apache.ignite.compute.ComputeTask#result(org.apache.ignite.compute.ComputeJobResult, List)} method into task on caller node. */ protected abstract Object executeJob(int gridSize, T arg); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java index 9f177d7..bd7ca71 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java @@ -17,15 +17,16 @@ package org.apache.ignite.internal.client.impl; -import junit.framework.*; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.impl.connection.*; -import org.apache.ignite.internal.processors.rest.handlers.cache.*; -import org.apache.ignite.internal.util.typedef.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.EnumSet; +import junit.framework.TestCase; +import org.apache.ignite.internal.client.GridClientCacheFlag; +import org.apache.ignite.internal.client.impl.connection.GridClientConnection; +import org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheCommandHandler; +import org.apache.ignite.internal.util.typedef.F; -import java.util.*; - -import static org.apache.ignite.internal.client.GridClientCacheFlag.*; +import static org.apache.ignite.internal.client.GridClientCacheFlag.KEEP_PORTABLES; /** * Tests conversions between GridClientCacheFlag. @@ -74,4 +75,4 @@ public class ClientCacheFlagsCodecTest extends TestCase { assertEquals(length > 0, out); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientComputeImplSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientComputeImplSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientComputeImplSelfTest.java index e120005..7777f33 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientComputeImplSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientComputeImplSelfTest.java @@ -17,13 +17,15 @@ package org.apache.ignite.internal.client.impl; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.testframework.junits.common.*; +import java.util.Collection; +import java.util.UUID; +import java.util.concurrent.Callable; +import org.apache.ignite.internal.client.GridClientCompute; +import org.apache.ignite.internal.client.GridClientNode; +import org.apache.ignite.internal.client.GridClientPredicate; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import java.util.*; -import java.util.concurrent.*; - -import static org.apache.ignite.testframework.GridTestUtils.*; +import static org.apache.ignite.testframework.GridTestUtils.assertThrows; /** * Simple unit test for GridClientComputeImpl which checks method parameters. @@ -164,4 +166,4 @@ public class ClientComputeImplSelfTest extends GridCommonAbstractTest { } }, NullPointerException.class, "Ouch! Argument cannot be null: ip"); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientDataImplSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientDataImplSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientDataImplSelfTest.java index 9de9a62..1638f31 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientDataImplSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientDataImplSelfTest.java @@ -17,12 +17,11 @@ package org.apache.ignite.internal.client.impl; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.testframework.junits.common.*; +import java.util.concurrent.Callable; +import org.apache.ignite.internal.client.GridClientData; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import java.util.concurrent.*; - -import static org.apache.ignite.testframework.GridTestUtils.*; +import static org.apache.ignite.testframework.GridTestUtils.assertThrows; /** * Simple unit test for GridClientDataImpl which checks method parameters. @@ -265,4 +264,4 @@ public class ClientDataImplSelfTest extends GridCommonAbstractTest { } }, NullPointerException.class, "Ouch! Argument cannot be null: key"); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientFutureAdapterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientFutureAdapterSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientFutureAdapterSelfTest.java index daa9445..67df048 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientFutureAdapterSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientFutureAdapterSelfTest.java @@ -17,11 +17,13 @@ package org.apache.ignite.internal.client.impl; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.testframework.junits.common.*; - -import java.util.*; -import java.util.concurrent.*; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.TimeUnit; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientFuture; +import org.apache.ignite.internal.client.GridClientFutureTimeoutException; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** * Grid client future implementation self test. @@ -112,4 +114,4 @@ public class ClientFutureAdapterSelfTest extends GridCommonAbstractTest { info("Time consumption for " + chainSize + " chained futures: " + (System.currentTimeMillis() - start)); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPropertiesConfigurationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPropertiesConfigurationSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPropertiesConfigurationSelfTest.java index 8e981d1..55aadfd 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPropertiesConfigurationSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPropertiesConfigurationSelfTest.java @@ -17,19 +17,32 @@ package org.apache.ignite.internal.client.impl; -import org.apache.commons.io.*; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.balancer.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.testframework.junits.common.*; -import org.springframework.context.support.*; - -import java.io.*; -import java.net.*; -import java.util.*; - -import static org.apache.ignite.internal.client.GridClientConfiguration.*; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Map; +import java.util.Properties; +import java.util.UUID; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.io.LineIterator; +import org.apache.ignite.internal.client.GridClientConfiguration; +import org.apache.ignite.internal.client.GridClientDataConfiguration; +import org.apache.ignite.internal.client.GridClientPartitionAffinity; +import org.apache.ignite.internal.client.GridClientProtocol; +import org.apache.ignite.internal.client.balancer.GridClientRandomBalancer; +import org.apache.ignite.internal.client.balancer.GridClientRoundRobinBalancer; +import org.apache.ignite.internal.util.IgniteUtils; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.springframework.context.support.FileSystemXmlApplicationContext; + +import static org.apache.ignite.internal.client.GridClientConfiguration.DFLT_MAX_CONN_IDLE_TIME; +import static org.apache.ignite.internal.client.GridClientConfiguration.DFLT_TOP_REFRESH_FREQ; /** * Properties-based configuration self test. @@ -229,4 +242,4 @@ public class ClientPropertiesConfigurationSelfTest extends GridCommonAbstractTes assertEquals(null, cfg.getSslContextFactory(), null); assertEquals(DFLT_TOP_REFRESH_FREQ, cfg.getTopologyRefreshFrequency()); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java index a2e7c38..ef18a29 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java @@ -17,18 +17,27 @@ package org.apache.ignite.internal.client.integration; -import org.apache.ignite.*; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.testframework.*; -import org.apache.ignite.testframework.junits.common.*; -import org.jetbrains.annotations.*; - -import java.net.*; -import java.util.*; +import java.net.InetAddress; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import org.apache.ignite.Ignite; +import org.apache.ignite.internal.client.GridClient; +import org.apache.ignite.internal.client.GridClientConfiguration; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientFactory; +import org.apache.ignite.internal.client.GridClientNode; +import org.apache.ignite.internal.client.GridClientProtocol; +import org.apache.ignite.internal.util.IgniteUtils; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.G; +import org.apache.ignite.internal.util.typedef.P1; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteBiTuple; +import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.jetbrains.annotations.Nullable; /** * Tests the REST client-server connectivity with various configurations. @@ -314,4 +323,4 @@ public abstract class ClientAbstractConnectivitySelfTest extends GridCommonAbstr return s.matches("\\d+\\.\\d+\\.\\d+\\.\\d+"); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java index 66f266a..5e5a68d 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java @@ -17,40 +17,70 @@ package org.apache.ignite.internal.client.integration; -import org.apache.ignite.*; -import org.apache.ignite.cache.affinity.rendezvous.*; -import org.apache.ignite.cluster.*; -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.client.balancer.*; -import org.apache.ignite.internal.client.ssl.*; -import org.apache.ignite.internal.managers.communication.*; -import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.processors.cache.distributed.*; -import org.apache.ignite.internal.processors.cache.transactions.*; -import org.apache.ignite.internal.processors.cache.version.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.plugin.extensions.communication.*; -import org.apache.ignite.resources.*; -import org.apache.ignite.spi.*; -import org.apache.ignite.spi.communication.tcp.*; -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.testframework.*; -import org.apache.ignite.testframework.junits.common.*; -import org.jetbrains.annotations.*; - -import java.util.*; -import java.util.concurrent.*; - -import static java.util.concurrent.TimeUnit.*; -import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.UUID; +import java.util.concurrent.Callable; +import java.util.concurrent.CountDownLatch; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteException; +import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.compute.ComputeJobAdapter; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.compute.ComputeTaskSplitAdapter; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.ConnectorConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.IgniteKernal; +import org.apache.ignite.internal.client.GridClient; +import org.apache.ignite.internal.client.GridClientCompute; +import org.apache.ignite.internal.client.GridClientConfiguration; +import org.apache.ignite.internal.client.GridClientDataConfiguration; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientFactory; +import org.apache.ignite.internal.client.GridClientNode; +import org.apache.ignite.internal.client.GridClientPartitionAffinity; +import org.apache.ignite.internal.client.GridClientPredicate; +import org.apache.ignite.internal.client.GridClientProtocol; +import org.apache.ignite.internal.client.GridClientTopologyListener; +import org.apache.ignite.internal.client.balancer.GridClientLoadBalancer; +import org.apache.ignite.internal.client.balancer.GridClientRoundRobinBalancer; +import org.apache.ignite.internal.client.ssl.GridSslContextFactory; +import org.apache.ignite.internal.managers.communication.GridIoMessage; +import org.apache.ignite.internal.processors.cache.GridCacheContext; +import org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockRequest; +import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx; +import org.apache.ignite.internal.processors.cache.transactions.IgniteTxManager; +import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; +import org.apache.ignite.internal.processors.cache.version.GridCacheVersionable; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.G; +import org.apache.ignite.lang.IgniteBiTuple; +import org.apache.ignite.lang.IgniteInClosure; +import org.apache.ignite.plugin.extensions.communication.Message; +import org.apache.ignite.resources.IgniteInstanceResource; +import org.apache.ignite.spi.IgniteSpiException; +import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.jetbrains.annotations.Nullable; + +import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; +import static org.apache.ignite.cache.CacheMode.LOCAL; +import static org.apache.ignite.cache.CacheMode.PARTITIONED; +import static org.apache.ignite.cache.CacheMode.REPLICATED; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * Tests basic client behavior with multiple nodes. @@ -497,4 +527,4 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract assertTrue("Invalid tx flags: " + t, t.syncCommit()); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java index d4758d5..125603e 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java @@ -17,31 +17,65 @@ package org.apache.ignite.internal.client.integration; -import junit.framework.*; -import net.sf.json.*; -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.internal.client.ssl.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -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.testframework.junits.common.*; -import org.jetbrains.annotations.*; - -import javax.cache.configuration.*; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; - -import static org.apache.ignite.IgniteSystemProperties.*; -import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.atomic.AtomicInteger; +import javax.cache.configuration.Factory; +import junit.framework.Assert; +import net.sf.json.JSON; +import net.sf.json.JSONArray; +import net.sf.json.JSONSerializer; +import net.sf.json.JsonConfig; +import org.apache.ignite.cache.store.CacheStore; +import org.apache.ignite.cache.store.CacheStoreAdapter; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.compute.ComputeJobAdapter; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.compute.ComputeTaskSplitAdapter; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.ConnectorConfiguration; +import org.apache.ignite.configuration.ConnectorMessageInterceptor; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.client.GridClient; +import org.apache.ignite.internal.client.GridClientClosedException; +import org.apache.ignite.internal.client.GridClientCompute; +import org.apache.ignite.internal.client.GridClientConfiguration; +import org.apache.ignite.internal.client.GridClientData; +import org.apache.ignite.internal.client.GridClientDataConfiguration; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientFactory; +import org.apache.ignite.internal.client.GridClientFuture; +import org.apache.ignite.internal.client.GridClientNode; +import org.apache.ignite.internal.client.GridClientPredicate; +import org.apache.ignite.internal.client.GridClientProtocol; +import org.apache.ignite.internal.client.GridServerUnreachableException; +import org.apache.ignite.internal.client.ssl.GridSslContextFactory; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteBiInClosure; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.spi.swapspace.file.FileSwapSpaceSpi; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.IgniteSystemProperties.IGNITE_JETTY_PORT; +import static org.apache.ignite.cache.CacheMode.LOCAL; +import static org.apache.ignite.cache.CacheMode.PARTITIONED; +import static org.apache.ignite.cache.CacheMode.REPLICATED; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * Tests for Java client. @@ -684,4 +718,4 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { map.remove(key); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java index e7705df..68816d1 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java @@ -17,20 +17,33 @@ package org.apache.ignite.internal.client.integration; -import org.apache.ignite.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.balancer.*; -import org.apache.ignite.resources.*; -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.testframework.junits.common.*; - -import java.util.*; - -import static org.apache.ignite.internal.client.integration.ClientAbstractMultiNodeSelfTest.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import org.apache.ignite.Ignite; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.compute.ComputeJobAdapter; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.compute.ComputeTaskSplitAdapter; +import org.apache.ignite.configuration.ConnectorConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.client.GridClient; +import org.apache.ignite.internal.client.GridClientConfiguration; +import org.apache.ignite.internal.client.GridClientFactory; +import org.apache.ignite.internal.client.balancer.GridClientLoadBalancer; +import org.apache.ignite.internal.client.balancer.GridClientRandomBalancer; +import org.apache.ignite.internal.client.balancer.GridClientRoundRobinBalancer; +import org.apache.ignite.resources.IgniteInstanceResource; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; + +import static org.apache.ignite.internal.client.integration.ClientAbstractMultiNodeSelfTest.HOST; +import static org.apache.ignite.internal.client.integration.ClientAbstractMultiNodeSelfTest.REST_TCP_PORT_BASE; +import static org.apache.ignite.internal.client.integration.ClientAbstractMultiNodeSelfTest.TOP_REFRESH_FREQ; /** * @@ -189,4 +202,4 @@ public class ClientPreferDirectSelfTest extends GridCommonAbstractTest { return ignite.cluster().localNode().id().toString(); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpConnectivitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpConnectivitySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpConnectivitySelfTest.java index 63f5945..5fcf802 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpConnectivitySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpConnectivitySelfTest.java @@ -17,12 +17,13 @@ package org.apache.ignite.internal.client.integration; -import org.apache.ignite.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.util.typedef.*; -import org.jetbrains.annotations.*; +import org.apache.ignite.Ignite; +import org.apache.ignite.configuration.ConnectorConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.IgniteNodeAttributes; +import org.apache.ignite.internal.client.GridClientProtocol; +import org.apache.ignite.internal.util.typedef.G; +import org.jetbrains.annotations.Nullable; /** * Tests the REST client-server TCP connectivity with various configurations. @@ -72,4 +73,4 @@ public class ClientTcpConnectivitySelfTest extends ClientAbstractConnectivitySel @Override protected GridClientProtocol protocol() { return GridClientProtocol.TCP; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpDirectMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpDirectMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpDirectMultiNodeSelfTest.java index ed374dc..087701b 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpDirectMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpDirectMultiNodeSelfTest.java @@ -17,9 +17,12 @@ package org.apache.ignite.internal.client.integration; -import org.apache.ignite.internal.client.*; - -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import org.apache.ignite.internal.client.GridClientConfiguration; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientProtocol; /** * @@ -52,4 +55,4 @@ public class ClientTcpDirectMultiNodeSelfTest extends ClientAbstractMultiNodeSel return cfg; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpDirectSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpDirectSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpDirectSelfTest.java index 8752538..f47ef0a 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpDirectSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpDirectSelfTest.java @@ -17,10 +17,11 @@ package org.apache.ignite.internal.client.integration; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.ssl.*; - -import java.util.*; +import java.util.Collections; +import org.apache.ignite.internal.client.GridClientConfiguration; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientProtocol; +import org.apache.ignite.internal.client.ssl.GridSslContextFactory; /** * @@ -55,4 +56,4 @@ public class ClientTcpDirectSelfTest extends ClientAbstractSelfTest { return cfg; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpMultiNodeSelfTest.java index 9cb1a7b..f9c196f 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpMultiNodeSelfTest.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.client.integration; -import org.apache.ignite.internal.client.*; +import org.apache.ignite.internal.client.GridClientProtocol; /** * Test for TCP binary rest protocol. @@ -32,4 +32,4 @@ public class ClientTcpMultiNodeSelfTest extends ClientAbstractMultiNodeSelfTest @Override protected String serverAddress() { return HOST + ":" + REST_TCP_PORT_BASE; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSelfTest.java index 0042bf7..e72da34 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSelfTest.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.client.integration; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.ssl.*; +import org.apache.ignite.internal.client.GridClientProtocol; +import org.apache.ignite.internal.client.ssl.GridSslContextFactory; /** * Tests TCP protocol. @@ -43,4 +43,4 @@ public class ClientTcpSelfTest extends ClientAbstractSelfTest { @Override protected GridSslContextFactory sslContextFactory() { return null; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslDirectMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslDirectMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslDirectMultiNodeSelfTest.java index 12d49e3..a42328b 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslDirectMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslDirectMultiNodeSelfTest.java @@ -17,11 +17,14 @@ package org.apache.ignite.internal.client.integration; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.ssl.*; -import org.apache.ignite.testframework.*; - -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import org.apache.ignite.internal.client.GridClientConfiguration; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientProtocol; +import org.apache.ignite.internal.client.ssl.GridSslContextFactory; +import org.apache.ignite.testframework.GridTestUtils; /** * @@ -59,4 +62,4 @@ public class ClientTcpSslDirectMultiNodeSelfTest extends ClientAbstractMultiNode return cfg; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslDirectSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslDirectSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslDirectSelfTest.java index aec7b22..71fa084 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslDirectSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslDirectSelfTest.java @@ -17,11 +17,12 @@ package org.apache.ignite.internal.client.integration; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.ssl.*; -import org.apache.ignite.testframework.*; - -import java.util.*; +import java.util.Collections; +import org.apache.ignite.internal.client.GridClientConfiguration; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientProtocol; +import org.apache.ignite.internal.client.ssl.GridSslContextFactory; +import org.apache.ignite.testframework.GridTestUtils; /** * @@ -56,4 +57,4 @@ public class ClientTcpSslDirectSelfTest extends ClientAbstractSelfTest { return cfg; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslMultiNodeSelfTest.java index 56355f7..d6ce77f 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslMultiNodeSelfTest.java @@ -17,9 +17,9 @@ package org.apache.ignite.internal.client.integration; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.ssl.*; -import org.apache.ignite.testframework.*; +import org.apache.ignite.internal.client.GridClientProtocol; +import org.apache.ignite.internal.client.ssl.GridSslContextFactory; +import org.apache.ignite.testframework.GridTestUtils; /** * Tests binary tcp protocol with SSL on multiple nodes. @@ -39,4 +39,4 @@ public class ClientTcpSslMultiNodeSelfTest extends ClientAbstractMultiNodeSelfTe @Override protected GridSslContextFactory sslContextFactory() { return GridTestUtils.sslContextFactory(); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslSelfTest.java index b39d651..dd7f14b 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpSslSelfTest.java @@ -17,9 +17,9 @@ package org.apache.ignite.internal.client.integration; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.ssl.*; -import org.apache.ignite.testframework.*; +import org.apache.ignite.internal.client.GridClientProtocol; +import org.apache.ignite.internal.client.ssl.GridSslContextFactory; +import org.apache.ignite.testframework.GridTestUtils; /** * Tests TCP binary protocol with client when SSL is enabled. @@ -44,4 +44,4 @@ public class ClientTcpSslSelfTest extends ClientAbstractSelfTest { @Override protected GridSslContextFactory sslContextFactory() { return GridTestUtils.sslContextFactory(); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpUnreachableMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpUnreachableMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpUnreachableMultiNodeSelfTest.java index fda7e99..e70df53 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpUnreachableMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpUnreachableMultiNodeSelfTest.java @@ -17,12 +17,20 @@ package org.apache.ignite.internal.client.integration; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.balancer.*; -import org.apache.ignite.internal.util.typedef.*; - -import java.net.*; -import java.util.*; +import java.net.InetSocketAddress; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import org.apache.ignite.internal.client.GridClientCacheMode; +import org.apache.ignite.internal.client.GridClientConfiguration; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientNode; +import org.apache.ignite.internal.client.GridClientNodeMetrics; +import org.apache.ignite.internal.client.GridClientProtocol; +import org.apache.ignite.internal.client.GridClientTopologyListener; +import org.apache.ignite.internal.client.balancer.GridClientLoadBalancer; +import org.apache.ignite.internal.util.typedef.F; /** * Test for TCP binary rest protocol with unreachable address. @@ -127,4 +135,4 @@ public class ClientTcpUnreachableMultiNodeSelfTest extends ClientTcpMultiNodeSel ((GridClientTopologyListener)b).onNodeRemoved(node); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java index ed0d720..ba52366 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java @@ -17,22 +17,38 @@ package org.apache.ignite.internal.client.router; -import org.apache.ignite.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.impl.connection.*; -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.internal.util.typedef.*; -import org.apache.ignite.testframework.junits.common.*; - -import java.util.*; - -import static org.apache.ignite.internal.client.GridClientProtocol.*; -import static org.apache.ignite.internal.client.integration.ClientAbstractSelfTest.*; -import static org.apache.ignite.IgniteSystemProperties.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.compute.ComputeJobAdapter; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.compute.ComputeTaskSplitAdapter; +import org.apache.ignite.configuration.ConnectorConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.client.GridClient; +import org.apache.ignite.internal.client.GridClientConfiguration; +import org.apache.ignite.internal.client.GridClientDisconnectedException; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientFactory; +import org.apache.ignite.internal.client.GridClientProtocol; +import org.apache.ignite.internal.client.GridServerUnreachableException; +import org.apache.ignite.internal.client.impl.connection.GridClientConnectionResetException; +import org.apache.ignite.internal.util.typedef.X; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; + +import static org.apache.ignite.IgniteSystemProperties.IGNITE_JETTY_PORT; +import static org.apache.ignite.internal.client.GridClientProtocol.TCP; +import static org.apache.ignite.internal.client.integration.ClientAbstractSelfTest.BINARY_PORT; +import static org.apache.ignite.internal.client.integration.ClientAbstractSelfTest.HOST; +import static org.apache.ignite.internal.client.integration.ClientAbstractSelfTest.JETTY_PORT; +import static org.apache.ignite.internal.client.integration.ClientAbstractSelfTest.REST_JETTY_CFG; /** * @@ -272,4 +288,4 @@ public class ClientFailedInitSelfTest extends GridCommonAbstractTest { return results.get(0).getData(); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java index e82393b..d5eee7f 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java @@ -17,15 +17,18 @@ package org.apache.ignite.internal.client.router; -import org.apache.ignite.configuration.*; -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.testframework.junits.common.*; - -import java.util.*; - -import static org.apache.ignite.IgniteSystemProperties.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; + +import static org.apache.ignite.IgniteSystemProperties.IGNITE_JETTY_PORT; /** * Test routers factory. @@ -104,4 +107,4 @@ public class RouterFactorySelfTest extends GridCommonAbstractTest { GridRouterFactory.stopAllRouters(); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java index 7bf8ddb..f0ce7fb 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java @@ -17,14 +17,18 @@ package org.apache.ignite.internal.client.router; -import org.apache.ignite.*; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.integration.*; -import org.apache.ignite.internal.client.router.impl.*; -import org.apache.ignite.logger.log4j.*; -import org.apache.ignite.internal.util.typedef.*; - -import java.util.*; +import java.util.Collections; +import java.util.List; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.client.GridClient; +import org.apache.ignite.internal.client.GridClientConfiguration; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientNode; +import org.apache.ignite.internal.client.GridClientProtocol; +import org.apache.ignite.internal.client.integration.ClientAbstractSelfTest; +import org.apache.ignite.internal.client.router.impl.GridTcpRouterImpl; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.logger.log4j.Log4JLogger; /** * Abstract base class for http routing tests. @@ -122,4 +126,4 @@ public abstract class TcpRouterAbstractSelfTest extends ClientAbstractSelfTest { assertFalse(F.first(nodes).connectable()); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterMultiNodeSelfTest.java index 8eb8421..ea73819 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterMultiNodeSelfTest.java @@ -17,15 +17,18 @@ package org.apache.ignite.internal.client.router; -import org.apache.ignite.*; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.integration.*; -import org.apache.ignite.internal.client.router.impl.*; -import org.apache.ignite.logger.log4j.*; - -import java.util.*; - -import static org.apache.ignite.internal.client.integration.ClientAbstractSelfTest.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.client.GridClientConfiguration; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientProtocol; +import org.apache.ignite.internal.client.integration.ClientAbstractMultiNodeSelfTest; +import org.apache.ignite.internal.client.router.impl.GridTcpRouterImpl; +import org.apache.ignite.logger.log4j.Log4JLogger; + +import static org.apache.ignite.internal.client.integration.ClientAbstractSelfTest.ROUTER_LOG_CFG; /** * @@ -107,4 +110,4 @@ public class TcpRouterMultiNodeSelfTest extends ClientAbstractMultiNodeSelfTest return cfg; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterSelfTest.java index e848dea..f2817ad 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterSelfTest.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.client.router; -import org.apache.ignite.internal.client.ssl.*; +import org.apache.ignite.internal.client.ssl.GridSslContextFactory; /** * Tests the simplest use case for router: singe router proxies connections to a single node. @@ -32,4 +32,4 @@ public class TcpRouterSelfTest extends TcpRouterAbstractSelfTest { @Override protected GridSslContextFactory sslContextFactory() { return null; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpSslRouterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpSslRouterSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpSslRouterSelfTest.java index 498be7d..1e2a2bd 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpSslRouterSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpSslRouterSelfTest.java @@ -17,9 +17,9 @@ package org.apache.ignite.internal.client.router; -import org.apache.ignite.*; -import org.apache.ignite.internal.client.ssl.*; -import org.apache.ignite.testframework.*; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.client.ssl.GridSslContextFactory; +import org.apache.ignite.testframework.GridTestUtils; /** * @@ -50,4 +50,4 @@ public class TcpSslRouterSelfTest extends TcpRouterAbstractSelfTest { return cfg; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java index e9d1ebb..fdb5456 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java @@ -17,14 +17,46 @@ package org.apache.ignite.internal.client.suite; -import junit.framework.*; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.impl.*; -import org.apache.ignite.internal.client.integration.*; -import org.apache.ignite.internal.client.router.*; -import org.apache.ignite.internal.client.util.*; -import org.apache.ignite.internal.processors.rest.*; -import org.apache.ignite.internal.processors.rest.protocols.tcp.*; +import junit.framework.TestSuite; +import org.apache.ignite.internal.client.ClientDefaultCacheSelfTest; +import org.apache.ignite.internal.client.ClientReconnectionSelfTest; +import org.apache.ignite.internal.client.ClientTcpMultiThreadedSelfTest; +import org.apache.ignite.internal.client.ClientTcpSslAuthenticationSelfTest; +import org.apache.ignite.internal.client.ClientTcpSslMultiThreadedSelfTest; +import org.apache.ignite.internal.client.ClientTcpTaskExecutionAfterTopologyRestartSelfTest; +import org.apache.ignite.internal.client.impl.ClientCacheFlagsCodecTest; +import org.apache.ignite.internal.client.impl.ClientComputeImplSelfTest; +import org.apache.ignite.internal.client.impl.ClientDataImplSelfTest; +import org.apache.ignite.internal.client.impl.ClientFutureAdapterSelfTest; +import org.apache.ignite.internal.client.impl.ClientPropertiesConfigurationSelfTest; +import org.apache.ignite.internal.client.integration.ClientPreferDirectSelfTest; +import org.apache.ignite.internal.client.integration.ClientTcpConnectivitySelfTest; +import org.apache.ignite.internal.client.integration.ClientTcpDirectMultiNodeSelfTest; +import org.apache.ignite.internal.client.integration.ClientTcpDirectSelfTest; +import org.apache.ignite.internal.client.integration.ClientTcpMultiNodeSelfTest; +import org.apache.ignite.internal.client.integration.ClientTcpSelfTest; +import org.apache.ignite.internal.client.integration.ClientTcpSslDirectMultiNodeSelfTest; +import org.apache.ignite.internal.client.integration.ClientTcpSslDirectSelfTest; +import org.apache.ignite.internal.client.integration.ClientTcpSslMultiNodeSelfTest; +import org.apache.ignite.internal.client.integration.ClientTcpSslSelfTest; +import org.apache.ignite.internal.client.integration.ClientTcpUnreachableMultiNodeSelfTest; +import org.apache.ignite.internal.client.router.ClientFailedInitSelfTest; +import org.apache.ignite.internal.client.router.RouterFactorySelfTest; +import org.apache.ignite.internal.client.router.TcpRouterMultiNodeSelfTest; +import org.apache.ignite.internal.client.router.TcpRouterSelfTest; +import org.apache.ignite.internal.client.router.TcpSslRouterSelfTest; +import org.apache.ignite.internal.client.util.ClientByteUtilsTest; +import org.apache.ignite.internal.client.util.ClientConsistentHashSelfTest; +import org.apache.ignite.internal.client.util.ClientJavaHasherSelfTest; +import org.apache.ignite.internal.processors.rest.ClientMemcachedProtocolSelfTest; +import org.apache.ignite.internal.processors.rest.JettyRestProcessorSignedSelfTest; +import org.apache.ignite.internal.processors.rest.JettyRestProcessorUnsignedSelfTest; +import org.apache.ignite.internal.processors.rest.RestBinaryProtocolSelfTest; +import org.apache.ignite.internal.processors.rest.RestMemcacheProtocolSelfTest; +import org.apache.ignite.internal.processors.rest.RestProcessorMultiStartSelfTest; +import org.apache.ignite.internal.processors.rest.RestProcessorStartSelfTest; +import org.apache.ignite.internal.processors.rest.TaskCommandHandlerSelfTest; +import org.apache.ignite.internal.processors.rest.protocols.tcp.TcpRestParserSelfTest; /** * Test suite includes all test that concern REST processors. @@ -112,4 +144,4 @@ public class IgniteClientTestSuite extends TestSuite { return suite; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientByteUtilsTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientByteUtilsTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientByteUtilsTest.java index 4f76784..72112cb 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientByteUtilsTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientByteUtilsTest.java @@ -17,13 +17,21 @@ package org.apache.ignite.internal.client.util; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.testframework.junits.common.*; -import org.junit.*; - -import java.util.*; - -import static org.apache.ignite.internal.util.GridClientByteUtils.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.UUID; +import org.apache.ignite.internal.util.GridClientByteUtils; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Assert; + +import static org.apache.ignite.internal.util.GridClientByteUtils.bytesToInt; +import static org.apache.ignite.internal.util.GridClientByteUtils.bytesToLong; +import static org.apache.ignite.internal.util.GridClientByteUtils.bytesToShort; +import static org.apache.ignite.internal.util.GridClientByteUtils.intToBytes; +import static org.apache.ignite.internal.util.GridClientByteUtils.longToBytes; +import static org.apache.ignite.internal.util.GridClientByteUtils.shortToBytes; /** * Test case for client's byte convertion utility. @@ -169,4 +177,4 @@ public class ClientByteUtilsTest extends GridCommonAbstractTest { return b; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientConsistentHashSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientConsistentHashSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientConsistentHashSelfTest.java index 7fb4501..fa9d4b4 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientConsistentHashSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientConsistentHashSelfTest.java @@ -17,9 +17,20 @@ package org.apache.ignite.internal.client.util; -import org.apache.ignite.testframework.junits.common.*; - -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; +import java.util.UUID; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** * Test for consistent hash management class. @@ -278,4 +289,4 @@ public class ClientConsistentHashSelfTest extends GridCommonAbstractTest { assertEquals("Check affinity for object: " + o, code, i); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientJavaHasherSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientJavaHasherSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientJavaHasherSelfTest.java index 46d0cca..765c58d 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientJavaHasherSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientJavaHasherSelfTest.java @@ -17,9 +17,10 @@ package org.apache.ignite.internal.client.util; -import org.apache.ignite.testframework.junits.common.*; - -import java.util.*; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.UUID; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** * Test for Java hash codes calculations - SHOULD BE PORTED to other languages. @@ -81,4 +82,4 @@ public class ClientJavaHasherSelfTest extends GridCommonAbstractTest { fail("Java hash codes validation fails."); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java index 8310b0f..bde9180 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java @@ -17,12 +17,14 @@ package org.apache.ignite.internal.processors.rest; -import org.apache.ignite.*; -import org.apache.ignite.configuration.*; -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.testframework.junits.common.*; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.ConnectorConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** * Abstract class for REST protocols tests. @@ -97,4 +99,4 @@ abstract class AbstractRestProcessorSelfTest extends GridCommonAbstractTest { @Override protected <K, V> IgniteCache<K, V> jcache() { return grid(0).cache(null); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ClientMemcachedProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ClientMemcachedProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ClientMemcachedProtocolSelfTest.java index 9b43482..0f56c73 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ClientMemcachedProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ClientMemcachedProtocolSelfTest.java @@ -17,17 +17,20 @@ package org.apache.ignite.internal.processors.rest; -import net.spy.memcached.*; -import org.apache.ignite.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.util.typedef.*; -import org.junit.*; - -import java.io.*; -import java.net.*; -import java.util.*; - -import static org.junit.Assert.*; +import java.io.Serializable; +import java.net.InetSocketAddress; +import java.net.SocketAddress; +import java.util.Date; +import java.util.Map; +import net.spy.memcached.BinaryConnectionFactory; +import net.spy.memcached.MemcachedClient; +import net.spy.memcached.MemcachedClientIF; +import org.apache.ignite.Ignite; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.util.typedef.F; +import org.junit.Assert; + +import static org.junit.Assert.assertArrayEquals; /** * Tests for TCP binary protocol. @@ -440,4 +443,4 @@ public class ClientMemcachedProtocolSelfTest extends AbstractRestProcessorSelfTe return res; } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java index 090e030..8db4cd7 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java @@ -17,23 +17,31 @@ package org.apache.ignite.internal.processors.rest; -import net.sf.json.*; -import org.apache.ignite.*; -import org.apache.ignite.cache.*; -import org.apache.ignite.cache.query.*; -import org.apache.ignite.cache.query.annotations.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.processors.rest.handlers.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.testframework.*; - -import java.io.*; -import java.net.*; -import java.util.*; -import java.util.concurrent.*; -import java.util.regex.*; - -import static org.apache.ignite.IgniteSystemProperties.*; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.LineNumberReader; +import java.io.Serializable; +import java.net.URL; +import java.net.URLConnection; +import java.net.URLEncoder; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.regex.Pattern; +import net.sf.json.JSONObject; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.cache.CachePeekMode; +import org.apache.ignite.cache.query.SqlQuery; +import org.apache.ignite.cache.query.annotations.QuerySqlField; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.internal.processors.rest.handlers.GridRestCommandHandler; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.testframework.GridTestUtils; + +import static org.apache.ignite.IgniteSystemProperties.IGNITE_JETTY_PORT; /** * Tests for Jetty REST protocol. @@ -1308,4 +1316,4 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro return id; } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java index 2bec958..cf9fa9e 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java @@ -17,12 +17,14 @@ package org.apache.ignite.internal.processors.rest; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import sun.misc.*; - -import java.net.*; -import java.security.*; +import java.net.HttpURLConnection; +import java.net.URL; +import java.net.URLConnection; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.util.typedef.internal.U; +import sun.misc.BASE64Encoder; /** * @@ -100,4 +102,4 @@ public class JettyRestProcessorSignedSelfTest extends JettyRestProcessorAbstract throw new Exception("Failed to create authentication signature.", e); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorUnsignedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorUnsignedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorUnsignedSelfTest.java index c3de703..e510ae8 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorUnsignedSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorUnsignedSelfTest.java @@ -33,4 +33,4 @@ public class JettyRestProcessorUnsignedSelfTest extends JettyRestProcessorAbstra @Override protected String signature() throws Exception { return null; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/MemcacheRestProcessorTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/MemcacheRestProcessorTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/MemcacheRestProcessorTest.java index fd61292..9a84424 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/MemcacheRestProcessorTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/MemcacheRestProcessorTest.java @@ -17,12 +17,13 @@ package org.apache.ignite.internal.processors.rest; -import net.spy.memcached.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.testframework.junits.common.*; - -import java.net.*; -import java.util.*; +import java.net.InetSocketAddress; +import java.util.Map; +import net.spy.memcached.BinaryConnectionFactory; +import net.spy.memcached.MemcachedClient; +import net.spy.memcached.MemcachedClientIF; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** */ @@ -73,4 +74,4 @@ public class MemcacheRestProcessorTest extends GridCommonAbstractTest { assert "1_val".equals(client.get("key")); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java index c4cdf19..7629afb 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java @@ -17,25 +17,37 @@ package org.apache.ignite.internal.processors.rest; -import org.apache.ignite.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.rest.client.message.*; -import org.apache.ignite.internal.util.typedef.*; -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.testframework.*; -import org.apache.ignite.testframework.junits.common.*; -import org.jetbrains.annotations.*; - -import java.lang.reflect.*; -import java.util.*; -import java.util.concurrent.*; - -import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.Callable; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.compute.ComputeJobAdapter; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.compute.ComputeTaskSplitAdapter; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.ConnectorConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.IgniteKernal; +import org.apache.ignite.internal.processors.rest.client.message.GridClientNodeBean; +import org.apache.ignite.internal.processors.rest.client.message.GridClientTaskResultBean; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.cache.CacheMode.LOCAL; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * TCP protocol test. @@ -606,4 +618,4 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest { return sum; } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java index aea71e5..fbaee9e 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java @@ -17,19 +17,20 @@ package org.apache.ignite.internal.processors.rest; -import junit.framework.*; -import org.apache.ignite.*; -import org.apache.ignite.configuration.*; -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.testframework.junits.common.*; -import org.jetbrains.annotations.*; - -import java.util.*; - -import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; +import java.util.Map; +import junit.framework.Assert; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.ConnectorConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.cache.CacheMode.LOCAL; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * TCP protocol test. @@ -336,4 +337,4 @@ public class RestMemcacheProtocolSelfTest extends GridCommonAbstractTest { public void testQuit() throws Exception { client.quit(); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java index 1bed679..7714dbf 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java @@ -17,8 +17,9 @@ package org.apache.ignite.internal.processors.rest; -import org.apache.ignite.configuration.*; -import org.apache.ignite.testframework.junits.common.*; +import org.apache.ignite.configuration.ConnectorConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** * Rest processor test. @@ -52,4 +53,4 @@ public class RestProcessorMultiStartSelfTest extends GridCommonAbstractTest { stopAllGrids(); } } -} +} \ No newline at end of file
