[20/50] incubator-ignite git commit: Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-tests

[agoncharuk]

Merge branch 'sprint-2' of 
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-tests

Conflicts:
        modules/core/src/main/java/org/apache/ignite/cache/query/SqlQuery.java
        
modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
        
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java


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

Branch: refs/heads/ignite-45
Commit: 04537ffe1cad319c826cbbb18365719dda213948
Parents: 498ea51
Author: S.Vladykin <svlady...@gridgain.com>
Authored: Tue Mar 17 02:57:14 2015 +0300
Committer: S.Vladykin <svlady...@gridgain.com>
Committed: Tue Mar 17 02:57:14 2015 +0300

----------------------------------------------------------------------
 .../GridCacheContinuousQueryAbstractSelfTest.java  | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/04537ffe/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
index 7203516..b19a6ca 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
@@ -131,7 +131,8 @@ public abstract class 
GridCacheContinuousQueryAbstractSelfTest extends GridCommo
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
         GridTestUtils.waitForCondition(new PA() {
-            @Override public boolean apply() {
+            @Override
+            public boolean apply() {
                 for (int i = 0; i < gridCount(); i++) {
                     if (grid(i).cluster().nodes().size() != gridCount())
                         return false;
@@ -343,8 +344,9 @@ public abstract class 
GridCacheContinuousQueryAbstractSelfTest extends GridCommo
             }
         });
 
-        qry.setRemoteFilter(new CacheEntryEventFilter<Integer, Integer>() {
-            @Override public boolean evaluate(CacheEntryEvent<? extends 
Integer, ? extends Integer> evt) {
+        qry.setRemoteFilter(new CacheEntryEventFilter<Integer,Integer>() {
+            @Override
+            public boolean evaluate(CacheEntryEvent<? extends Integer,? 
extends Integer> evt) {
                 return evt.getKey() > 2;
             }
         });
@@ -395,9 +397,10 @@ public abstract class 
GridCacheContinuousQueryAbstractSelfTest extends GridCommo
         final Map<Integer, List<Integer>> map = new HashMap<>();
         final CountDownLatch latch = new CountDownLatch(1);
 
-        qry.setLocalListener(new CacheEntryUpdatedListener<Integer, Integer>() 
{
-            @Override public void onUpdated(Iterable<CacheEntryEvent<? extends 
Integer, ? extends Integer>> evts) {
-                for (CacheEntryEvent<? extends Integer, ? extends Integer> e : 
evts) {
+        qry.setLocalListener(new CacheEntryUpdatedListener<Integer,Integer>() {
+            @Override
+            public void onUpdated(Iterable<CacheEntryEvent<? extends Integer,? 
extends Integer>> evts) {
+                for (CacheEntryEvent<? extends Integer,? extends Integer> e : 
evts) {
                     synchronized (map) {
                         List<Integer> vals = map.get(e.getKey());
 
@@ -846,7 +849,7 @@ public abstract class 
GridCacheContinuousQueryAbstractSelfTest extends GridCommo
     public void testNodeJoinWithoutCache() throws Exception {
         IgniteCache<Integer, Integer> cache = grid(0).jcache(null);
 
-        ContinuousQuery<Integer, Integer> qry = Query.continuous();
+        ContinuousQuery<Integer, Integer> qry = new ContinuousQuery<>();
 
         final CountDownLatch latch = new CountDownLatch(1);