[05/35] incubator-ignite git commit: # IGNITE-261 Cleanup API: WIP scalar.

[sboikov]

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7007771c/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala 
b/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
index 78eda65..6f5553b 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
@@ -24,7 +24,6 @@ import org.apache.ignite._
 import org.apache.ignite.cache.query.annotations.{QuerySqlField, 
QueryTextField}
 import org.apache.ignite.cluster.ClusterNode
 import org.apache.ignite.configuration.IgniteConfiguration
-import org.apache.ignite.internal.IgniteVersionUtils
 import org.apache.ignite.internal.IgniteVersionUtils._
 import org.jetbrains.annotations.Nullable
 
@@ -264,8 +263,7 @@ object scalar extends ScalarConversions {
      * this function - otherwise Scala will create `Cache[Nothing, Nothing]`
      * typed instance that cannot be used.
      */
-    @inline def cache$[K, V]: Option[IgniteCache[K, V]] =
-        Option(Ignition.ignite.jcache[K, V](null))
+    @inline def cache$[K, V]: Option[IgniteCache[K, V]] = 
Option(Ignition.ignite.jcache[K, V](null))
 
     /**
      * Gets named cache from default grid.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7007771c/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheQueriesSpec.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheQueriesSpec.scala
 
b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheQueriesSpec.scala
index 7c2431b..f4e7fb8 100644
--- 
a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheQueriesSpec.scala
+++ 
b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheQueriesSpec.scala
@@ -17,7 +17,8 @@
 
 package org.apache.ignite.scalar.tests
 
-import org.apache.ignite.cache.GridCache
+import org.apache.ignite.IgniteCache
+import org.apache.ignite.cache.CachePeekMode
 import org.apache.ignite.cluster.ClusterNode
 import org.apache.ignite.scalar.scalar._
 import org.junit.runner.RunWith
@@ -40,7 +41,7 @@ class ScalarCacheQueriesSpec extends FlatSpec with 
ShouldMatchers with BeforeAnd
     private var n: ClusterNode = null
 
     /** Cache. */
-    private var c: GridCache[Int, ObjectValue] = null
+    private var c: IgniteCache[Int, ObjectValue] = null
 
     /**
      * Start node and put data to cache.
@@ -48,11 +49,13 @@ class ScalarCacheQueriesSpec extends FlatSpec with 
ShouldMatchers with BeforeAnd
     override def beforeAll() {
         n = 
start("modules/scalar/src/test/resources/spring-cache.xml").cluster().localNode
 
-        // c = cache$[Int, ObjectValue].get TODO
+        c = cache$[Int, ObjectValue].get
 
-        (1 to ENTRY_CNT).foreach(i => c.putx(i, ObjectValue(i, "str " + 
WORDS(i))))
+        (1 to ENTRY_CNT).foreach(i => c.put(i, ObjectValue(i, "str " + 
WORDS(i))))
 
-        assert(c.size == ENTRY_CNT)
+        val peekModes = Array.empty[CachePeekMode]
+
+        assert(c.size(peekModes:_*) == ENTRY_CNT)
 
         c.foreach(e => println(e.getKey + " -> " + e.getValue))
     }