ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [09/31] incubator-ignite git commit: #ignite-128: WIP.
Date Tue, 03 Feb 2015 14:18:36 GMT
#ignite-128: WIP.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4127b4d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4127b4d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4127b4d5

Branch: refs/heads/ignite-128
Commit: 4127b4d53ef63b1110ff10f4aee1096dd1a5522b
Parents: b88a101
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Tue Feb 3 12:23:54 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Tue Feb 3 12:23:54 2015 +0300

----------------------------------------------------------------------
 .../ClientAbstractMultiThreadedSelfTest.java    |   2 +-
 .../ClientTcpSslAuthenticationSelfTest.java     |   2 +-
 .../ignite/client/ClientTestRestServer.java     |   4 +-
 .../ClientPropertiesConfigurationSelfTest.java  |   2 +-
 .../ClientAbstractMultiNodeSelfTest.java        |   2 +-
 .../integration/ClientPreferDirectSelfTest.java |   2 +-
 .../ClientTcpUnreachableMultiNodeSelfTest.java  |   2 +-
 .../processors/rest/TestBinaryClient.java       |   4 +-
 .../protocols/tcp/TcpRestParserSelfTest.java    |   4 +-
 .../client/ClientMarshallerBenchmarkTest.java   |   6 +-
 .../balancer/GridClientBalancerAdapter.java     |  76 -------------
 .../client/balancer/GridClientLoadBalancer.java |  44 --------
 .../balancer/GridClientRandomBalancer.java      |  75 -------------
 .../balancer/GridClientRoundRobinBalancer.java  | 111 -------------------
 .../impl/GridClientAbstractProjection.java      |   2 +-
 .../client/impl/GridClientComputeImpl.java      |   2 +-
 .../ignite/client/impl/GridClientDataImpl.java  |   2 +-
 .../ignite/client/impl/GridClientImpl.java      |   2 +-
 .../connection/GridClientNioTcpConnection.java  |   6 +-
 .../client/marshaller/GridClientMarshaller.java |  45 --------
 .../marshaller/jdk/GridClientJdkMarshaller.java |  68 ------------
 .../GridClientOptimizedMarshaller.java          | 103 -----------------
 .../ignite/internal/client/GridClient.java      |   4 +-
 .../internal/client/GridClientCompute.java      |   2 +-
 .../client/GridClientConfiguration.java         |   9 +-
 .../client/GridClientDataConfiguration.java     |   2 +-
 .../balancer/GridClientBalancerAdapter.java     |  76 +++++++++++++
 .../client/balancer/GridClientLoadBalancer.java |  44 ++++++++
 .../balancer/GridClientRandomBalancer.java      |  75 +++++++++++++
 .../balancer/GridClientRoundRobinBalancer.java  | 111 +++++++++++++++++++
 .../client/marshaller/GridClientMarshaller.java |  45 ++++++++
 .../marshaller/jdk/GridClientJdkMarshaller.java |  68 ++++++++++++
 .../GridClientOptimizedMarshaller.java          | 103 +++++++++++++++++
 .../impl/GridTcpRouterNioListenerAdapter.java   |   6 +-
 .../router/impl/GridTcpRouterNioParser.java     |   2 +-
 .../portable/GridPortableProcessor.java         |   2 +-
 .../portable/os/GridOsPortableProcessor.java    |   2 +-
 .../protocols/tcp/GridTcpRestDirectParser.java  |   2 +-
 .../protocols/tcp/GridTcpRestNioListener.java   |   2 +-
 .../rest/protocols/tcp/GridTcpRestParser.java   |   2 +-
 .../rest/protocols/tcp/GridTcpRestProtocol.java |   6 +-
 .../GridHadoopClientProtocolProvider.java       |   2 +-
 42 files changed, 564 insertions(+), 567 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java
----------------------------------------------------------------------
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 ec772bb..b3dc41f 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
@@ -25,10 +25,10 @@ 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.lang.*;
 import org.apache.ignite.resources.*;
-import org.apache.ignite.client.balancer.*;
 import org.apache.ignite.client.impl.*;
 import org.apache.ignite.internal.processors.affinity.*;
 import org.apache.ignite.spi.discovery.tcp.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpSslAuthenticationSelfTest.java
----------------------------------------------------------------------
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 0c0149c..801235b 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
@@ -18,9 +18,9 @@
 package org.apache.ignite.client;
 
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.client.balancer.*;
 import org.apache.ignite.client.impl.*;
 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.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/clients/src/test/java/org/apache/ignite/client/ClientTestRestServer.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientTestRestServer.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientTestRestServer.java
index fbe3dda..d25120e 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/ClientTestRestServer.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientTestRestServer.java
@@ -18,8 +18,8 @@
 package org.apache.ignite.client;
 
 import org.apache.ignite.*;
-import org.apache.ignite.client.marshaller.*;
-import org.apache.ignite.client.marshaller.optimized.*;
+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.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java
----------------------------------------------------------------------
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 bf6296d..0dc9534 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.balancer.*;
 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.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java
----------------------------------------------------------------------
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 33de7d3..418901f 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
@@ -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.internal.client.balancer.*;
 import org.apache.ignite.internal.client.ssl.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.cache.distributed.*;
@@ -35,7 +36,6 @@ 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.client.balancer.*;
 import org.apache.ignite.internal.managers.communication.*;
 import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.util.direct.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientPreferDirectSelfTest.java
----------------------------------------------------------------------
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 f11d361..921957c 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
@@ -21,8 +21,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.internal.client.balancer.*;
 import org.apache.ignite.resources.*;
-import org.apache.ignite.client.balancer.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpUnreachableMultiNodeSelfTest.java
----------------------------------------------------------------------
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 c5fbd07..201ffa5 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.balancer.*;
 import org.apache.ignite.internal.client.*;
+import org.apache.ignite.internal.client.balancer.*;
 import org.apache.ignite.internal.util.typedef.*;
 
 import java.net.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java
index a6e7c7f..8b13eac 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java
@@ -18,10 +18,10 @@
 package org.apache.ignite.internal.processors.rest;
 
 import org.apache.ignite.*;
+import org.apache.ignite.internal.client.marshaller.*;
+import org.apache.ignite.internal.client.marshaller.optimized.*;
 import org.apache.ignite.internal.util.*;
 import org.apache.ignite.logger.java.*;
-import org.apache.ignite.client.marshaller.*;
-import org.apache.ignite.client.marshaller.optimized.*;
 import org.apache.ignite.internal.processors.rest.client.message.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java
index 27c4a6f..9aade44 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.rest.protocols.tcp;
 
-import org.apache.ignite.client.marshaller.*;
-import org.apache.ignite.client.marshaller.optimized.*;
+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.util.nio.*;
 import org.apache.ignite.internal.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientMarshallerBenchmarkTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientMarshallerBenchmarkTest.java b/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientMarshallerBenchmarkTest.java
index 0d737e7..ba9db0b 100644
--- a/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientMarshallerBenchmarkTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientMarshallerBenchmarkTest.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.loadtests.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.marshaller.*;
+import org.apache.ignite.internal.client.marshaller.jdk.*;
+import org.apache.ignite.internal.client.marshaller.optimized.*;
 import org.apache.ignite.internal.processors.rest.client.message.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.testframework.junits.common.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/client/balancer/GridClientBalancerAdapter.java
----------------------------------------------------------------------
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
deleted file mode 100644
index 7edffe9..0000000
--- a/modules/core/src/main/java/org/apache/ignite/client/balancer/GridClientBalancerAdapter.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.client.balancer;
-
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-
-import java.util.*;
-
-/**
- * Base class for balancers. Contains common direct connection handling logic.
- */
-public abstract class GridClientBalancerAdapter implements GridClientLoadBalancer {
-    /** Selects connectable nodes. */
-    private static final IgnitePredicate<GridClientNode> CONNECTABLE =
-        new IgnitePredicate<GridClientNode>() {
-            @Override public boolean apply(GridClientNode e) {
-                return e.connectable();
-            }
-        };
-
-    /** Prefer direct nodes. */
-    private boolean preferDirectNodes;
-
-    /**
-     * If set to {@code true} balancer should prefer directly connectable
-     * nodes over others.
-     * <p>
-     * In other words when working in router connection mode
-     * client will prefer send requests to router nodes
-     * if operation projection contains some of them.
-     * <p>
-     * Default value is {@code false}.
-     *
-     * @see GridClientNode#connectable()
-     * @return Prefer direct nodes.
-     */
-    public boolean isPreferDirectNodes() {
-        return preferDirectNodes;
-    }
-
-    /**
-     * Sets prefer direct nodes.
-     *
-     * @param preferDirectNodes Prefer direct nodes.
-     */
-    public void setPreferDirectNodes(boolean preferDirectNodes) {
-        this.preferDirectNodes = preferDirectNodes;
-    }
-
-    /**
-     * Returns only directly available nodes from given collection.
-     *
-     * @param nodes Nodes.
-     * @return Directly available subset.
-     */
-    protected static Collection<GridClientNode> selectDirectNodes(Collection<? extends GridClientNode> nodes) {
-        return F.viewReadOnly(nodes, F.<GridClientNode>identity(), CONNECTABLE);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/client/balancer/GridClientLoadBalancer.java
----------------------------------------------------------------------
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
deleted file mode 100644
index 06d1104..0000000
--- a/modules/core/src/main/java/org/apache/ignite/client/balancer/GridClientLoadBalancer.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.client.balancer;
-
-import org.apache.ignite.internal.client.*;
-
-import java.util.*;
-
-/**
- * Interface that defines a selection logic of a server node for a particular operation.
- * Use it to define custom load balancing logic for client. Load balancer is specified via
- * {@link GridClientConfiguration#getBalancer()} configuration property.
- * <p>
- * The following implementations are provided out of the box:
- * <ul>
- * <li>{@link GridClientRandomBalancer}</li>
- * <li>{@link GridClientRoundRobinBalancer}</li>
- * </ul>
- */
-public interface GridClientLoadBalancer {
-    /**
-     * Gets next node for executing client command.
-     *
-     * @param nodes Nodes to pick from, should not be empty.
-     * @return Next node to pick.
-     * @throws GridClientException If balancer can't match given nodes with current topology snapshot.
-     */
-    public GridClientNode balancedNode(Collection<? extends GridClientNode> nodes) throws GridClientException;
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/client/balancer/GridClientRandomBalancer.java
----------------------------------------------------------------------
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
deleted file mode 100644
index 221e2e9..0000000
--- a/modules/core/src/main/java/org/apache/ignite/client/balancer/GridClientRandomBalancer.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.client.balancer;
-
-import org.apache.ignite.internal.client.*;
-
-import java.util.*;
-
-/**
- * Simple balancer that relies on random node selection from a given collection. This implementation
- * has no any caches and treats each given collection as a new one.
- * <p>
- * More strictly, for any non-empty collection of size <tt>n</tt> the probability of selection of any
- * node in this collection will be <tt>1/n</tt>.
- */
-public class GridClientRandomBalancer extends GridClientBalancerAdapter {
-    /** Random for node selection. */
-    private Random random = new Random();
-
-    /**
-     * Picks up a random node from a collection.
-     *
-     * @param nodes Nodes to pick from.
-     * @return Random node from collection.
-     */
-    @Override public GridClientNode balancedNode(Collection<? extends GridClientNode> nodes) {
-        assert !nodes.isEmpty();
-
-        int size = nodes.size();
-
-        if (isPreferDirectNodes()) {
-            Collection<GridClientNode> direct = selectDirectNodes(nodes);
-
-            int directSize = direct.size();
-
-            // If set of direct nodes is not empty and differ from original one
-            // replace original set of nodes with directly available.
-            if (directSize > 0 && directSize < size) {
-                nodes = direct;
-                size = nodes.size();
-            }
-        }
-
-        int idx = random.nextInt(size);
-
-        if (nodes instanceof List)
-            return ((List<GridClientNode>)nodes).get(idx);
-        else {
-            Iterator<? extends GridClientNode> it = nodes.iterator();
-
-            while (idx > 0) {
-                it.next();
-
-                idx--;
-            }
-
-            return it.next();
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/client/balancer/GridClientRoundRobinBalancer.java
----------------------------------------------------------------------
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
deleted file mode 100644
index 3eb0dc6..0000000
--- a/modules/core/src/main/java/org/apache/ignite/client/balancer/GridClientRoundRobinBalancer.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.client.balancer;
-
-import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
-import java.util.concurrent.locks.*;
-
-/**
- * Simple balancer that implements round-robin balancing.
- */
-public class GridClientRoundRobinBalancer extends GridClientBalancerAdapter implements GridClientTopologyListener {
-    /** Lock. */
-    private Lock lock = new ReentrantLock();
-
-    /** Nodes to share load. */
-    private LinkedList<UUID> nodeQueue = new LinkedList<>();
-
-    /** {@inheritDoc} */
-    @Override public GridClientNode balancedNode(Collection<? extends GridClientNode> nodes)
-        throws GridClientException {
-        assert !nodes.isEmpty();
-
-        if (isPreferDirectNodes()) {
-            Collection<GridClientNode> direct = selectDirectNodes(nodes);
-
-            int directSize = direct.size();
-
-            // If set of direct nodes is not empty and differ from original one
-            // replace original set of nodes with directly available.
-            if (directSize > 0 && directSize < nodes.size())
-                nodes = direct;
-        }
-
-        Map<UUID, GridClientNode> lookup = U.newHashMap(nodes.size());
-
-        for (GridClientNode node : nodes)
-            lookup.put(node.nodeId(), node);
-
-        lock.lock();
-
-        try {
-            GridClientNode balanced = null;
-
-            for (Iterator<UUID> iter = nodeQueue.iterator(); iter.hasNext();) {
-                UUID nodeId = iter.next();
-
-                balanced = lookup.get(nodeId);
-
-                if (balanced != null) {
-                    iter.remove();
-
-                    break;
-                }
-            }
-
-            if (balanced != null) {
-                nodeQueue.addLast(balanced.nodeId());
-
-                return balanced;
-            }
-
-            throw new GridClientException("Passed nodes doesn't present in topology " +
-                "[nodes=" + nodes + ", top=" + nodeQueue);
-        }
-        finally {
-            lock.unlock();
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public void onNodeAdded(GridClientNode node) {
-        lock.lock();
-
-        try {
-            nodeQueue.addFirst(node.nodeId());
-        }
-        finally {
-            lock.unlock();
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public void onNodeRemoved(GridClientNode node) {
-        lock.lock();
-
-        try {
-            nodeQueue.remove(node.nodeId());
-        }
-        finally {
-            lock.unlock();
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientAbstractProjection.java
----------------------------------------------------------------------
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 d6b3a3d..aaed5fa 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,9 +18,9 @@
 package org.apache.ignite.client.impl;
 
 import org.apache.ignite.*;
-import org.apache.ignite.client.balancer.*;
 import org.apache.ignite.client.impl.connection.*;
 import org.apache.ignite.internal.client.*;
+import org.apache.ignite.internal.client.balancer.*;
 import org.apache.ignite.internal.client.util.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.jetbrains.annotations.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientComputeImpl.java
----------------------------------------------------------------------
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 c76d21d..4ad91ac 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.balancer.*;
 import org.apache.ignite.client.impl.connection.*;
 import org.apache.ignite.internal.client.*;
+import org.apache.ignite.internal.client.balancer.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientDataImpl.java
----------------------------------------------------------------------
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 7c1f240..a45a471 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,9 +17,9 @@
 
 package org.apache.ignite.client.impl;
 
-import org.apache.ignite.client.balancer.*;
 import org.apache.ignite.client.impl.connection.*;
 import org.apache.ignite.internal.client.*;
+import org.apache.ignite.internal.client.balancer.*;
 import org.apache.ignite.internal.client.util.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientImpl.java
----------------------------------------------------------------------
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 1bfb63f..ffe07e4 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,9 +18,9 @@
 package org.apache.ignite.client.impl;
 
 import org.apache.ignite.*;
-import org.apache.ignite.client.balancer.*;
 import org.apache.ignite.client.impl.connection.*;
 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.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/client/impl/connection/GridClientNioTcpConnection.java
----------------------------------------------------------------------
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 e8fcb06..95c53db 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
@@ -19,10 +19,10 @@ package org.apache.ignite.client.impl.connection;
 
 import org.apache.ignite.*;
 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.client.marshaller.*;
+import org.apache.ignite.internal.client.marshaller.jdk.*;
+import org.apache.ignite.internal.client.marshaller.optimized.*;
 import org.apache.ignite.internal.processors.rest.client.message.*;
 import org.apache.ignite.internal.util.nio.*;
 import org.apache.ignite.internal.util.nio.ssl.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/client/marshaller/GridClientMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/client/marshaller/GridClientMarshaller.java b/modules/core/src/main/java/org/apache/ignite/client/marshaller/GridClientMarshaller.java
deleted file mode 100644
index a6b5b69..0000000
--- a/modules/core/src/main/java/org/apache/ignite/client/marshaller/GridClientMarshaller.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.client.marshaller;
-
-import java.io.*;
-import java.nio.*;
-
-/**
- * Marshaller for binary protocol messages.
- */
-public interface GridClientMarshaller {
-    /**
-     * Marshals object to byte array.
-     *
-     * @param obj Object to marshal.
-     * @param off Start offset.
-     * @return Byte buffer.
-     * @throws IOException If marshalling failed.
-     */
-    public ByteBuffer marshal(Object obj, int off) throws IOException;
-
-    /**
-     * Unmarshals object from byte array.
-     *
-     * @param bytes Byte array.
-     * @return Unmarshalled object.
-     * @throws IOException If unmarshalling failed.
-     */
-    public <T> T unmarshal(byte[] bytes) throws IOException;
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/client/marshaller/jdk/GridClientJdkMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/client/marshaller/jdk/GridClientJdkMarshaller.java b/modules/core/src/main/java/org/apache/ignite/client/marshaller/jdk/GridClientJdkMarshaller.java
deleted file mode 100644
index 83f2ef8..0000000
--- a/modules/core/src/main/java/org/apache/ignite/client/marshaller/jdk/GridClientJdkMarshaller.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.client.marshaller.jdk;
-
-import org.apache.ignite.client.marshaller.*;
-import org.apache.ignite.internal.util.io.*;
-
-import java.io.*;
-import java.nio.*;
-
-/**
- * Simple marshaller that utilize JDK serialization features.
- */
-public class GridClientJdkMarshaller implements GridClientMarshaller {
-    /** ID. */
-    public static final byte ID = 2;
-
-    /** {@inheritDoc} */
-    @Override public ByteBuffer marshal(Object obj, int off) throws IOException {
-        GridByteArrayOutputStream bOut = new GridByteArrayOutputStream();
-
-        ObjectOutput out = new ObjectOutputStream(bOut);
-
-        out.writeObject(obj);
-
-        out.flush();
-
-        ByteBuffer buf = ByteBuffer.allocate(off + bOut.size());
-
-        buf.position(off);
-
-        buf.put(bOut.internalArray(), 0, bOut.size());
-
-        buf.flip();
-
-        return buf;
-    }
-
-    /** {@inheritDoc} */
-    @SuppressWarnings("unchecked")
-    @Override public <T> T unmarshal(byte[] bytes) throws IOException {
-        ByteArrayInputStream tmp = new ByteArrayInputStream(bytes);
-
-        ObjectInput in = new ObjectInputStream(tmp);
-
-        try {
-            return (T)in.readObject();
-        }
-        catch (ClassNotFoundException e) {
-            throw new IOException("Failed to unmarshal target object: " + e.getMessage(), e);
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/client/marshaller/optimized/GridClientOptimizedMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/client/marshaller/optimized/GridClientOptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/client/marshaller/optimized/GridClientOptimizedMarshaller.java
deleted file mode 100644
index 5f42828..0000000
--- a/modules/core/src/main/java/org/apache/ignite/client/marshaller/optimized/GridClientOptimizedMarshaller.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.client.marshaller.optimized;
-
-import org.apache.ignite.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.client.marshaller.*;
-import org.apache.ignite.internal.processors.rest.client.message.*;
-
-import java.io.*;
-import java.nio.*;
-import java.util.*;
-
-/**
- * Wrapper, that adapts {@link org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller} to
- * {@link GridClientMarshaller} interface.
- */
-public class GridClientOptimizedMarshaller implements GridClientMarshaller {
-    /** ID. */
-    public static final byte ID = 1;
-
-    /** Optimized marshaller. */
-    private final IgniteOptimizedMarshaller opMarsh;
-
-    /**
-     * Default constructor.
-     */
-    public GridClientOptimizedMarshaller() {
-        opMarsh = new IgniteOptimizedMarshaller();
-    }
-
-    /**
-     * Constructs optimized marshaller with specific parameters.
-     *
-     * @param requireSer Flag to enforce {@link Serializable} interface or not. If {@code true},
-     *      then objects will be required to implement {@link Serializable} in order to be
-     *      marshalled, if {@code false}, then such requirement will be relaxed.
-     * @param clsNames User preregistered class names.
-     * @param clsNamesPath Path to a file with user preregistered class names.
-     * @param poolSize Object streams pool size.
-     * @throws IOException If an I/O error occurs while writing stream header.
-     * @throws IgniteException If this marshaller is not supported on the current JVM.
-     * @see org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller
-     */
-    public GridClientOptimizedMarshaller(boolean requireSer, List<String> clsNames, String clsNamesPath, int poolSize)
-        throws IOException {
-        try {
-            opMarsh = new IgniteOptimizedMarshaller(requireSer, clsNames, clsNamesPath, poolSize);
-        }
-        catch (IgniteCheckedException e) {
-            throw new IOException(e);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public ByteBuffer marshal(Object obj, int off) throws IOException {
-        try {
-            if (!(obj instanceof GridClientMessage))
-                throw new IOException("Message serialization of given type is not supported: " +
-                    obj.getClass().getName());
-
-            byte[] bytes = opMarsh.marshal(obj);
-
-            ByteBuffer buf = ByteBuffer.allocate(off + bytes.length);
-
-            buf.position(off);
-
-            buf.put(bytes);
-
-            buf.flip();
-
-            return buf;
-        }
-        catch (IgniteCheckedException e) {
-            throw new IOException(e);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public <T> T unmarshal(byte[] bytes) throws IOException {
-        try {
-            return opMarsh.unmarshal(bytes, null);
-        }
-        catch (IgniteCheckedException e) {
-            throw new IOException(e);
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/internal/client/GridClient.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClient.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClient.java
index 5f02abd..69df16c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClient.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClient.java
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.client.balancer.*;
-
 import java.util.*;
 
 /**
@@ -85,7 +83,7 @@ public interface GridClient extends AutoCloseable {
     /**
      * Gets a default compute projection. Default compute projection will include all nodes
      * in remote grid. Selection of node that will be connected to perform operations will be
-     * done according to {@link GridClientLoadBalancer} provided in client configuration or
+     * done according to {@link org.apache.ignite.internal.client.balancer.GridClientLoadBalancer} provided in client configuration or
      * according to affinity if projection call involves affinity key.
      * <p>
      * More restricted projection configurations may be created with {@link GridClientCompute} methods.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java
index 7b86c24..3835a8d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.client.balancer.*;
+import org.apache.ignite.internal.client.balancer.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
index 9eb9798..330fca8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
@@ -17,12 +17,11 @@
 
 package org.apache.ignite.internal.client;
 
+import org.apache.ignite.internal.client.balancer.*;
+import org.apache.ignite.internal.client.marshaller.*;
+import org.apache.ignite.internal.client.marshaller.optimized.*;
 import org.apache.ignite.internal.client.ssl.*;
 import org.apache.ignite.portables.*;
-import org.apache.ignite.client.balancer.*;
-import org.apache.ignite.client.marshaller.*;
-import org.apache.ignite.client.marshaller.jdk.*;
-import org.apache.ignite.client.marshaller.optimized.*;
 import org.apache.ignite.plugin.security.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
@@ -613,7 +612,7 @@ public class GridClientConfiguration {
      * <ul>
      *     <li>{@link GridClientOptimizedMarshaller} (default) - GridGain's optimized marshaller.</li>
      *     <li>{@code GridClientPortableMarshaller} - Marshaller that supports portable objects.</li>
-     *     <li>{@link GridClientJdkMarshaller} - JDK marshaller (not recommended).</li>
+     *     <li>{@link org.apache.ignite.internal.client.marshaller.jdk.GridClientJdkMarshaller} - JDK marshaller (not recommended).</li>
      * </ul>
      *
      * @return A marshaller to use.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataConfiguration.java
index bc3b9ca..eaf39f4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientDataConfiguration.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.client.balancer.*;
+import org.apache.ignite.internal.client.balancer.*;
 
 /**
  * Java client data configuration.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientBalancerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientBalancerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientBalancerAdapter.java
new file mode 100644
index 0000000..86032a8
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientBalancerAdapter.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.client.balancer;
+
+import org.apache.ignite.internal.client.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.util.typedef.*;
+
+import java.util.*;
+
+/**
+ * Base class for balancers. Contains common direct connection handling logic.
+ */
+public abstract class GridClientBalancerAdapter implements GridClientLoadBalancer {
+    /** Selects connectable nodes. */
+    private static final IgnitePredicate<GridClientNode> CONNECTABLE =
+        new IgnitePredicate<GridClientNode>() {
+            @Override public boolean apply(GridClientNode e) {
+                return e.connectable();
+            }
+        };
+
+    /** Prefer direct nodes. */
+    private boolean preferDirectNodes;
+
+    /**
+     * If set to {@code true} balancer should prefer directly connectable
+     * nodes over others.
+     * <p>
+     * In other words when working in router connection mode
+     * client will prefer send requests to router nodes
+     * if operation projection contains some of them.
+     * <p>
+     * Default value is {@code false}.
+     *
+     * @see GridClientNode#connectable()
+     * @return Prefer direct nodes.
+     */
+    public boolean isPreferDirectNodes() {
+        return preferDirectNodes;
+    }
+
+    /**
+     * Sets prefer direct nodes.
+     *
+     * @param preferDirectNodes Prefer direct nodes.
+     */
+    public void setPreferDirectNodes(boolean preferDirectNodes) {
+        this.preferDirectNodes = preferDirectNodes;
+    }
+
+    /**
+     * Returns only directly available nodes from given collection.
+     *
+     * @param nodes Nodes.
+     * @return Directly available subset.
+     */
+    protected static Collection<GridClientNode> selectDirectNodes(Collection<? extends GridClientNode> nodes) {
+        return F.viewReadOnly(nodes, F.<GridClientNode>identity(), CONNECTABLE);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientLoadBalancer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientLoadBalancer.java b/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientLoadBalancer.java
new file mode 100644
index 0000000..298e216
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientLoadBalancer.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.client.balancer;
+
+import org.apache.ignite.internal.client.*;
+
+import java.util.*;
+
+/**
+ * Interface that defines a selection logic of a server node for a particular operation.
+ * Use it to define custom load balancing logic for client. Load balancer is specified via
+ * {@link GridClientConfiguration#getBalancer()} configuration property.
+ * <p>
+ * The following implementations are provided out of the box:
+ * <ul>
+ * <li>{@link GridClientRandomBalancer}</li>
+ * <li>{@link GridClientRoundRobinBalancer}</li>
+ * </ul>
+ */
+public interface GridClientLoadBalancer {
+    /**
+     * Gets next node for executing client command.
+     *
+     * @param nodes Nodes to pick from, should not be empty.
+     * @return Next node to pick.
+     * @throws GridClientException If balancer can't match given nodes with current topology snapshot.
+     */
+    public GridClientNode balancedNode(Collection<? extends GridClientNode> nodes) throws GridClientException;
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientRandomBalancer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientRandomBalancer.java b/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientRandomBalancer.java
new file mode 100644
index 0000000..d5e7c34
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientRandomBalancer.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.client.balancer;
+
+import org.apache.ignite.internal.client.*;
+
+import java.util.*;
+
+/**
+ * Simple balancer that relies on random node selection from a given collection. This implementation
+ * has no any caches and treats each given collection as a new one.
+ * <p>
+ * More strictly, for any non-empty collection of size <tt>n</tt> the probability of selection of any
+ * node in this collection will be <tt>1/n</tt>.
+ */
+public class GridClientRandomBalancer extends GridClientBalancerAdapter {
+    /** Random for node selection. */
+    private Random random = new Random();
+
+    /**
+     * Picks up a random node from a collection.
+     *
+     * @param nodes Nodes to pick from.
+     * @return Random node from collection.
+     */
+    @Override public GridClientNode balancedNode(Collection<? extends GridClientNode> nodes) {
+        assert !nodes.isEmpty();
+
+        int size = nodes.size();
+
+        if (isPreferDirectNodes()) {
+            Collection<GridClientNode> direct = selectDirectNodes(nodes);
+
+            int directSize = direct.size();
+
+            // If set of direct nodes is not empty and differ from original one
+            // replace original set of nodes with directly available.
+            if (directSize > 0 && directSize < size) {
+                nodes = direct;
+                size = nodes.size();
+            }
+        }
+
+        int idx = random.nextInt(size);
+
+        if (nodes instanceof List)
+            return ((List<GridClientNode>)nodes).get(idx);
+        else {
+            Iterator<? extends GridClientNode> it = nodes.iterator();
+
+            while (idx > 0) {
+                it.next();
+
+                idx--;
+            }
+
+            return it.next();
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientRoundRobinBalancer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientRoundRobinBalancer.java b/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientRoundRobinBalancer.java
new file mode 100644
index 0000000..f0320a9
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientRoundRobinBalancer.java
@@ -0,0 +1,111 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.client.balancer;
+
+import org.apache.ignite.internal.client.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+
+import java.util.*;
+import java.util.concurrent.locks.*;
+
+/**
+ * Simple balancer that implements round-robin balancing.
+ */
+public class GridClientRoundRobinBalancer extends GridClientBalancerAdapter implements GridClientTopologyListener {
+    /** Lock. */
+    private Lock lock = new ReentrantLock();
+
+    /** Nodes to share load. */
+    private LinkedList<UUID> nodeQueue = new LinkedList<>();
+
+    /** {@inheritDoc} */
+    @Override public GridClientNode balancedNode(Collection<? extends GridClientNode> nodes)
+        throws GridClientException {
+        assert !nodes.isEmpty();
+
+        if (isPreferDirectNodes()) {
+            Collection<GridClientNode> direct = selectDirectNodes(nodes);
+
+            int directSize = direct.size();
+
+            // If set of direct nodes is not empty and differ from original one
+            // replace original set of nodes with directly available.
+            if (directSize > 0 && directSize < nodes.size())
+                nodes = direct;
+        }
+
+        Map<UUID, GridClientNode> lookup = U.newHashMap(nodes.size());
+
+        for (GridClientNode node : nodes)
+            lookup.put(node.nodeId(), node);
+
+        lock.lock();
+
+        try {
+            GridClientNode balanced = null;
+
+            for (Iterator<UUID> iter = nodeQueue.iterator(); iter.hasNext();) {
+                UUID nodeId = iter.next();
+
+                balanced = lookup.get(nodeId);
+
+                if (balanced != null) {
+                    iter.remove();
+
+                    break;
+                }
+            }
+
+            if (balanced != null) {
+                nodeQueue.addLast(balanced.nodeId());
+
+                return balanced;
+            }
+
+            throw new GridClientException("Passed nodes doesn't present in topology " +
+                "[nodes=" + nodes + ", top=" + nodeQueue);
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public void onNodeAdded(GridClientNode node) {
+        lock.lock();
+
+        try {
+            nodeQueue.addFirst(node.nodeId());
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public void onNodeRemoved(GridClientNode node) {
+        lock.lock();
+
+        try {
+            nodeQueue.remove(node.nodeId());
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/GridClientMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/GridClientMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/GridClientMarshaller.java
new file mode 100644
index 0000000..c981805
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/GridClientMarshaller.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.client.marshaller;
+
+import java.io.*;
+import java.nio.*;
+
+/**
+ * Marshaller for binary protocol messages.
+ */
+public interface GridClientMarshaller {
+    /**
+     * Marshals object to byte array.
+     *
+     * @param obj Object to marshal.
+     * @param off Start offset.
+     * @return Byte buffer.
+     * @throws IOException If marshalling failed.
+     */
+    public ByteBuffer marshal(Object obj, int off) throws IOException;
+
+    /**
+     * Unmarshals object from byte array.
+     *
+     * @param bytes Byte array.
+     * @return Unmarshalled object.
+     * @throws IOException If unmarshalling failed.
+     */
+    public <T> T unmarshal(byte[] bytes) throws IOException;
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/jdk/GridClientJdkMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/jdk/GridClientJdkMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/jdk/GridClientJdkMarshaller.java
new file mode 100644
index 0000000..a3c3621
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/jdk/GridClientJdkMarshaller.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.client.marshaller.jdk;
+
+import org.apache.ignite.internal.client.marshaller.*;
+import org.apache.ignite.internal.util.io.*;
+
+import java.io.*;
+import java.nio.*;
+
+/**
+ * Simple marshaller that utilize JDK serialization features.
+ */
+public class GridClientJdkMarshaller implements GridClientMarshaller {
+    /** ID. */
+    public static final byte ID = 2;
+
+    /** {@inheritDoc} */
+    @Override public ByteBuffer marshal(Object obj, int off) throws IOException {
+        GridByteArrayOutputStream bOut = new GridByteArrayOutputStream();
+
+        ObjectOutput out = new ObjectOutputStream(bOut);
+
+        out.writeObject(obj);
+
+        out.flush();
+
+        ByteBuffer buf = ByteBuffer.allocate(off + bOut.size());
+
+        buf.position(off);
+
+        buf.put(bOut.internalArray(), 0, bOut.size());
+
+        buf.flip();
+
+        return buf;
+    }
+
+    /** {@inheritDoc} */
+    @SuppressWarnings("unchecked")
+    @Override public <T> T unmarshal(byte[] bytes) throws IOException {
+        ByteArrayInputStream tmp = new ByteArrayInputStream(bytes);
+
+        ObjectInput in = new ObjectInputStream(tmp);
+
+        try {
+            return (T)in.readObject();
+        }
+        catch (ClassNotFoundException e) {
+            throw new IOException("Failed to unmarshal target object: " + e.getMessage(), e);
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java
new file mode 100644
index 0000000..f9695fa
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.client.marshaller.optimized;
+
+import org.apache.ignite.*;
+import org.apache.ignite.internal.client.marshaller.*;
+import org.apache.ignite.marshaller.optimized.*;
+import org.apache.ignite.internal.processors.rest.client.message.*;
+
+import java.io.*;
+import java.nio.*;
+import java.util.*;
+
+/**
+ * Wrapper, that adapts {@link org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller} to
+ * {@link org.apache.ignite.internal.client.marshaller.GridClientMarshaller} interface.
+ */
+public class GridClientOptimizedMarshaller implements GridClientMarshaller {
+    /** ID. */
+    public static final byte ID = 1;
+
+    /** Optimized marshaller. */
+    private final IgniteOptimizedMarshaller opMarsh;
+
+    /**
+     * Default constructor.
+     */
+    public GridClientOptimizedMarshaller() {
+        opMarsh = new IgniteOptimizedMarshaller();
+    }
+
+    /**
+     * Constructs optimized marshaller with specific parameters.
+     *
+     * @param requireSer Flag to enforce {@link Serializable} interface or not. If {@code true},
+     *      then objects will be required to implement {@link Serializable} in order to be
+     *      marshalled, if {@code false}, then such requirement will be relaxed.
+     * @param clsNames User preregistered class names.
+     * @param clsNamesPath Path to a file with user preregistered class names.
+     * @param poolSize Object streams pool size.
+     * @throws IOException If an I/O error occurs while writing stream header.
+     * @throws IgniteException If this marshaller is not supported on the current JVM.
+     * @see org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller
+     */
+    public GridClientOptimizedMarshaller(boolean requireSer, List<String> clsNames, String clsNamesPath, int poolSize)
+        throws IOException {
+        try {
+            opMarsh = new IgniteOptimizedMarshaller(requireSer, clsNames, clsNamesPath, poolSize);
+        }
+        catch (IgniteCheckedException e) {
+            throw new IOException(e);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public ByteBuffer marshal(Object obj, int off) throws IOException {
+        try {
+            if (!(obj instanceof GridClientMessage))
+                throw new IOException("Message serialization of given type is not supported: " +
+                    obj.getClass().getName());
+
+            byte[] bytes = opMarsh.marshal(obj);
+
+            ByteBuffer buf = ByteBuffer.allocate(off + bytes.length);
+
+            buf.position(off);
+
+            buf.put(bytes);
+
+            buf.flip();
+
+            return buf;
+        }
+        catch (IgniteCheckedException e) {
+            throw new IOException(e);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public <T> T unmarshal(byte[] bytes) throws IOException {
+        try {
+            return opMarsh.unmarshal(bytes, null);
+        }
+        catch (IgniteCheckedException e) {
+            throw new IOException(e);
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java
index a5dc2d1..42fe1fa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java
@@ -18,10 +18,10 @@
 package org.apache.ignite.internal.client.router.impl;
 
 import org.apache.ignite.*;
-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.client.marshaller.*;
+import org.apache.ignite.internal.client.marshaller.jdk.*;
+import org.apache.ignite.internal.client.marshaller.optimized.*;
 import org.apache.ignite.internal.processors.rest.client.message.*;
 import org.apache.ignite.internal.util.nio.*;
 import org.apache.ignite.internal.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java
index 23f5aa3..35625b1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.internal.client.router.impl;
 
 import org.apache.ignite.*;
-import org.apache.ignite.client.marshaller.*;
+import org.apache.ignite.internal.client.marshaller.*;
 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.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableProcessor.java
index 272b194..02100f2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableProcessor.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.portable;
 
+import org.apache.ignite.internal.client.marshaller.*;
 import org.apache.ignite.internal.processors.*;
 import org.apache.ignite.portables.*;
-import org.apache.ignite.client.marshaller.*;
 import org.jetbrains.annotations.*;
 
 import java.nio.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/os/GridOsPortableProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/os/GridOsPortableProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/os/GridOsPortableProcessor.java
index 056e36b..718231f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/os/GridOsPortableProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/os/GridOsPortableProcessor.java
@@ -18,10 +18,10 @@
 package org.apache.ignite.internal.processors.portable.os;
 
 import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.client.marshaller.*;
 import org.apache.ignite.internal.processors.*;
 import org.apache.ignite.internal.processors.portable.*;
 import org.apache.ignite.portables.*;
-import org.apache.ignite.client.marshaller.*;
 import org.jetbrains.annotations.*;
 
 import java.nio.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestDirectParser.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestDirectParser.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestDirectParser.java
index 55d7c95..fd26860 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestDirectParser.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestDirectParser.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.internal.processors.rest.protocols.tcp;
 
 import org.apache.ignite.*;
-import org.apache.ignite.client.marshaller.*;
+import org.apache.ignite.internal.client.marshaller.*;
 import org.apache.ignite.internal.processors.rest.client.message.*;
 import org.apache.ignite.internal.util.direct.*;
 import org.apache.ignite.internal.util.nio.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java
index 9aaf3c7..6355938 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.rest.protocols.tcp;
 
 import org.apache.ignite.*;
 import org.apache.ignite.internal.*;
-import org.apache.ignite.client.marshaller.*;
+import org.apache.ignite.internal.client.marshaller.*;
 import org.apache.ignite.internal.processors.rest.*;
 import org.apache.ignite.internal.processors.rest.client.message.*;
 import org.apache.ignite.internal.processors.rest.handlers.cache.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java
index 98a7753..b407eec 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java
@@ -18,10 +18,10 @@
 package org.apache.ignite.internal.processors.rest.protocols.tcp;
 
 import org.apache.ignite.*;
+import org.apache.ignite.internal.client.marshaller.*;
 import org.apache.ignite.internal.util.*;
 import org.apache.ignite.marshaller.*;
 import org.apache.ignite.marshaller.jdk.*;
-import org.apache.ignite.client.marshaller.*;
 import org.apache.ignite.internal.processors.rest.client.message.*;
 import org.apache.ignite.internal.util.nio.*;
 import org.apache.ignite.internal.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
index bb52163..3c702ca 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
@@ -20,13 +20,13 @@ package org.apache.ignite.internal.processors.rest.protocols.tcp;
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.client.marshaller.*;
+import org.apache.ignite.internal.client.marshaller.jdk.*;
+import org.apache.ignite.internal.client.marshaller.optimized.*;
 import org.apache.ignite.internal.client.ssl.*;
 import org.apache.ignite.marshaller.*;
 import org.apache.ignite.marshaller.jdk.*;
 import org.apache.ignite.spi.*;
-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.processors.rest.*;
 import org.apache.ignite.internal.processors.rest.client.message.*;
 import org.apache.ignite.internal.processors.rest.protocols.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4127b4d5/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolProvider.java
----------------------------------------------------------------------
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 d28c2fb..397bff4 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.*;
 import org.apache.hadoop.mapreduce.protocol.*;
 import org.apache.ignite.*;
 import org.apache.ignite.internal.*;
-import org.apache.ignite.client.marshaller.optimized.*;
 import org.apache.ignite.internal.client.*;
+import org.apache.ignite.internal.client.marshaller.optimized.*;
 import org.apache.ignite.internal.util.future.*;
 import org.apache.ignite.internal.util.typedef.*;
 


Mime
View raw message