http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure3Function.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure3Function.scala
 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure3Function.scala
deleted file mode 100644
index daaceee..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure3Function.scala
+++ /dev/null
@@ -1,34 +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.gridgain.scalar.lang
-
-import org.apache.ignite.internal.util.lang.{GridInClosure3}
-
-/**
- * Wrapping Scala function for `GridInClosure3`.
- */
-class ScalarInClosure3Function[T1, T2, T3](val inner: GridInClosure3[T1, T2, 
T3]) extends ((T1, T2, T3) => Unit) {
-    assert(inner != null)
-
-    /**
-     * Delegates to passed in grid closure.
-     */
-    def apply(t1: T1, t2: T2, t3: T3) {
-        inner.apply(t1, t2, t3)
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure3X.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure3X.scala
 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure3X.scala
deleted file mode 100644
index ee782b1..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure3X.scala
+++ /dev/null
@@ -1,37 +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.gridgain.scalar.lang
-
-import org.apache.ignite._
-import org.gridgain.grid._
-import org.apache.ignite.internal.util.lang.GridInClosure3X
-
-/**
- * Peer deploy aware adapter for Java's `GridInClosure3X`.
- */
-class ScalarInClosure3X[T1, T2, T3](private val f: (T1, T2, T3) => Unit) 
extends GridInClosure3X[T1, T2, T3] {
-    assert(f != null)
-
-    /**
-     * Delegates to passed in function.
-     */
-    @throws(classOf[IgniteCheckedException])
-    def applyx(t1: T1, t2: T2, t3: T3) {
-        f(t1, t2, t3)
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure3XFunction.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure3XFunction.scala
 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure3XFunction.scala
deleted file mode 100644
index ef650de..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure3XFunction.scala
+++ /dev/null
@@ -1,34 +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.gridgain.scalar.lang
-
-import org.apache.ignite.internal.util.lang.{GridInClosure3X}
-
-/**
- * Wrapping Scala function for `GridInClosure3X`.
- */
-class ScalarInClosure3XFunction[T1, T2, T3](val inner: GridInClosure3X[T1, T2, 
T3]) extends ((T1, T2, T3) => Unit) {
-    assert(inner != null)
-
-    /**
-     * Delegates to passed in grid closure.
-     */
-    def apply(t1: T1, t2: T2, t3: T3) {
-        inner.applyx(t1, t2, t3)
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosureFunction.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosureFunction.scala
 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosureFunction.scala
deleted file mode 100644
index fbcdfb5..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosureFunction.scala
+++ /dev/null
@@ -1,34 +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.gridgain.scalar.lang
-
-import org.apache.ignite.lang.IgniteInClosure
-
-/**
- * Wrapping Scala function for `GridInClosure`.
- */
-class ScalarInClosureFunction[T](val inner: IgniteInClosure[T]) extends (T => 
Unit) {
-    assert(inner != null)
-
-    /**
-     * Delegates to passed in grid closure.
-     */
-    def apply(t: T) {
-        inner.apply(t)
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosureX.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosureX.scala 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosureX.scala
deleted file mode 100644
index d037f95..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosureX.scala
+++ /dev/null
@@ -1,37 +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.gridgain.scalar.lang
-
-import org.apache.ignite._
-import org.gridgain.grid._
-import org.apache.ignite.internal.util.lang.IgniteInClosureX
-
-/**
- * Peer deploy aware adapter for Java's `GridInClosureX`.
- */
-class ScalarInClosureX[T](private val f: T => Unit) extends 
IgniteInClosureX[T] {
-    assert(f != null)
-
-    /**
-     * Delegates to passed in function.
-     */
-    @throws(classOf[IgniteCheckedException])
-    def applyx(t: T) {
-        f(t)
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosureXFunction.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosureXFunction.scala
 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosureXFunction.scala
deleted file mode 100644
index e64bc38..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosureXFunction.scala
+++ /dev/null
@@ -1,34 +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.gridgain.scalar.lang
-
-import org.apache.ignite.internal.util.lang.{IgniteInClosureX}
-
-/**
- * Wrapping Scala function for `GridInClosureX`.
- */
-class ScalarInClosureXFunction[T](val inner: IgniteInClosureX[T]) extends (T 
=> Unit) {
-    assert(inner != null)
-
-    /**
-     * Delegates to passed in grid closure.
-     */
-    def apply(t: T) {
-        inner.applyx(t)
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarJob.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarJob.scala 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarJob.scala
deleted file mode 100644
index 0a263c6..0000000
--- a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarJob.scala
+++ /dev/null
@@ -1,32 +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.gridgain.scalar.lang
-
-import org.apache.ignite.compute.ComputeJobAdapter
-
-/**
- * Peer deploy aware adapter for Java's `ComputeJob`.
- */
-class ScalarJob(private val inner: () => Any) extends ComputeJobAdapter {
-    assert(inner != null)
-
-    /**
-     * Delegates to passed in function.
-     */
-    def execute = inner().asInstanceOf[AnyRef]
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarOutClosure.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarOutClosure.scala 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarOutClosure.scala
deleted file mode 100644
index 994a39a..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarOutClosure.scala
+++ /dev/null
@@ -1,46 +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.gridgain.scalar.lang
-
-import java.util.concurrent.Callable
-import org.apache.ignite.lang.IgniteOutClosure
-import org.apache.ignite.internal.util.lang.GridPeerDeployAwareAdapter
-
-/**
- * Peer deploy aware adapter for Java's `GridOutClosure`.
- */
-class ScalarOutClosure[R](private val f: () => R) extends 
GridPeerDeployAwareAdapter
-    with IgniteOutClosure[R] with Callable[R] {
-    assert(f != null)
-
-    peerDeployLike(f)
-
-    /**
-     * Delegates to passed in function.
-     */
-    def apply: R = {
-        f()
-    }
-
-    /**
-     * Delegates to passed in function.
-     */
-    def call: R = {
-        f()
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarOutClosureFunction.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarOutClosureFunction.scala
 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarOutClosureFunction.scala
deleted file mode 100644
index 0fb3fc7..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarOutClosureFunction.scala
+++ /dev/null
@@ -1,33 +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.gridgain.scalar.lang
-
-import java.util.concurrent.Callable
-
-/**
- * Wrapping Scala function for `Callable` and specifically for 
`GridOutClosure`.
- */
-class ScalarOutClosureFunction[R](val inner: Callable[R]) extends (() => R) {
-    assert(inner != null)
-
-    /**
-     * Delegates to passed in grid closure.
-     */
-    def apply(): R =
-        inner.call()
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarOutClosureX.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarOutClosureX.scala
 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarOutClosureX.scala
deleted file mode 100644
index b3e8417..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarOutClosureX.scala
+++ /dev/null
@@ -1,37 +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.gridgain.scalar.lang
-
-import org.apache.ignite._
-import org.gridgain.grid._
-import org.apache.ignite.internal.util.lang.IgniteOutClosureX
-
-/**
- * Peer deploy aware adapter for Java's `GridOutClosureX`.
- */
-class ScalarOutClosureX[R](private val f: () => R) extends 
IgniteOutClosureX[R] {
-    assert(f != null)
-
-    /**
-     * Delegates to passed in function.
-     */
-    @throws(classOf[IgniteCheckedException])
-    def applyx(): R = {
-        f()
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarOutClosureXFunction.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarOutClosureXFunction.scala
 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarOutClosureXFunction.scala
deleted file mode 100644
index dee618a..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarOutClosureXFunction.scala
+++ /dev/null
@@ -1,34 +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.gridgain.scalar.lang
-
-import org.apache.ignite.internal.util.lang.{IgniteOutClosureX}
-
-/**
- * Wrapping Scala function for `GridOutClosureX`.
- */
-class ScalarOutClosureXFunction[R](val inner: IgniteOutClosureX[R]) extends 
(() => R) {
-    assert(inner != null)
-
-    /**
-     * Delegates to passed in grid closure.
-     */
-    def apply(): R = {
-        inner.applyx()
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate.scala 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate.scala
deleted file mode 100644
index 73fa53d..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate.scala
+++ /dev/null
@@ -1,32 +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.gridgain.scalar.lang
-
-import org.apache.ignite.lang.IgnitePredicate
-
-/**
- * Peer deploy aware adapter for Java's `GridPredicate`.
- */
-class ScalarPredicate[T](private val p: T => Boolean) extends 
IgnitePredicate[T] {
-    assert(p != null)
-
-    /**
-     * Delegates to passed in function.
-     */
-    def apply(e: T) = p(e)
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate2.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate2.scala 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate2.scala
deleted file mode 100644
index ddeeae2..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate2.scala
+++ /dev/null
@@ -1,32 +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.gridgain.scalar.lang
-
-import org.apache.ignite.lang.IgniteBiPredicate
-
-/**
- * Peer deploy aware adapter for Java's `GridPredicate2`.
- */
-class ScalarPredicate2[T1, T2](private val p: (T1, T2) => Boolean) extends 
IgniteBiPredicate[T1, T2] {
-    assert(p != null)
-
-    /**
-     * Delegates to passed in function.
-     */
-    def apply(e1: T1, e2: T2) = p(e1, e2)
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate2Function.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate2Function.scala
 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate2Function.scala
deleted file mode 100644
index f727bd9..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate2Function.scala
+++ /dev/null
@@ -1,34 +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.gridgain.scalar.lang
-
-import org.apache.ignite.lang.IgniteBiPredicate
-
-/**
- * Wrapping Scala function for `GridPredicate2`.
- */
-class ScalarPredicate2Function[T1, T2](val inner: IgniteBiPredicate[T1, T2]) 
extends ((T1, T2) => Boolean) {
-    assert(inner != null)
-
-    /**
-     * Delegates to passed in grid predicate.
-     */
-    def apply(t1: T1, t2: T2): Boolean = {
-        inner.apply(t1, t2)
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate2X.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate2X.scala
 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate2X.scala
deleted file mode 100644
index 4dd5654..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate2X.scala
+++ /dev/null
@@ -1,37 +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.gridgain.scalar.lang
-
-import org.apache.ignite._
-import org.gridgain.grid._
-import org.apache.ignite.internal.util.lang.IgnitePredicate2X
-
-/**
- * Peer deploy aware adapter for Java's `GridPredicate2X`.
- */
-class ScalarPredicate2X[T1, T2](private val p: (T1, T2) => Boolean) extends 
IgnitePredicate2X[T1, T2] {
-    assert(p != null)
-
-    /**
-     * Delegates to passed in function.
-     */
-    @throws(classOf[IgniteCheckedException])
-    def applyx(e1: T1, e2: T2): Boolean = {
-        p(e1, e2)
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate2XFunction.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate2XFunction.scala
 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate2XFunction.scala
deleted file mode 100644
index d9ae654..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate2XFunction.scala
+++ /dev/null
@@ -1,34 +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.gridgain.scalar.lang
-
-import org.apache.ignite.internal.util.lang.IgnitePredicate2X
-
-/**
- * Wrapping Scala function for `GridPredicate2X`.
- */
-class ScalarPredicate2XFunction[T1, T2](val inner: IgnitePredicate2X[T1, T2]) 
extends ((T1, T2) => Boolean) {
-    assert(inner != null)
-
-    /**
-     * Delegates to passed in grid predicate.
-     */
-    def apply(t1: T1, t2: T2): Boolean = {
-        inner.applyx(t1, t2)
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate3.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate3.scala 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate3.scala
deleted file mode 100644
index f3c576c..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate3.scala
+++ /dev/null
@@ -1,32 +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.gridgain.scalar.lang
-
-import org.apache.ignite.internal.util.lang.GridPredicate3
-
-/**
- * Peer deploy aware adapter for Java's `GridPredicate3`.
- */
-class ScalarPredicate3[T1, T2, T3](private val p: (T1, T2, T3) => Boolean) 
extends GridPredicate3[T1, T2, T3] {
-    assert(p != null)
-
-    /**
-     * Delegates to passed in function.
-     */
-    def apply(e1: T1, e2: T2, e3: T3) = p(e1, e2, e3)
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate3Function.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate3Function.scala
 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate3Function.scala
deleted file mode 100644
index 5d2672d..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate3Function.scala
+++ /dev/null
@@ -1,34 +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.gridgain.scalar.lang
-
-import org.apache.ignite.internal.util.lang.{GridPredicate3}
-
-/**
- * Wrapping Scala function for `GridPredicate3`.
- */
-class ScalarPredicate3Function[T1, T2, T3](val inner: GridPredicate3[T1, T2, 
T3]) extends ((T1, T2, T3) => Boolean) {
-    assert(inner != null)
-
-    /**
-     * Delegates to passed in grid predicate.
-     */
-    def apply(t1: T1, t2: T2, t3: T3): Boolean = {
-        inner.apply(t1, t2, t3)
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate3X.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate3X.scala
 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate3X.scala
deleted file mode 100644
index 7e44624..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate3X.scala
+++ /dev/null
@@ -1,37 +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.gridgain.scalar.lang
-
-import org.apache.ignite._
-import org.gridgain.grid._
-import org.apache.ignite.internal.util.lang.GridPredicate3X
-
-/**
- * Peer deploy aware adapter for Java's `GridPredicate3X`.
- */
-class ScalarPredicate3X[T1, T2, T3](private val p: (T1, T2, T3) => Boolean) 
extends GridPredicate3X[T1, T2, T3] {
-    assert(p != null)
-
-    /**
-     * Delegates to passed in function.
-     */
-    @throws(classOf[IgniteCheckedException])
-    def applyx(e1: T1, e2: T2, e3: T3): Boolean = {
-        p(e1, e2, e3)
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate3XFunction.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate3XFunction.scala
 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate3XFunction.scala
deleted file mode 100644
index 8272c5d..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate3XFunction.scala
+++ /dev/null
@@ -1,34 +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.gridgain.scalar.lang
-
-import org.apache.ignite.internal.util.lang.{GridPredicate3X}
-
-/**
- * Wrapping Scala function for `GridPredicate3X`.
- */
-class ScalarPredicate3XFunction[T1, T2, T3](val inner: GridPredicate3X[T1, T2, 
T3]) extends ((T1, T2, T3) => Boolean) {
-    assert(inner != null)
-
-    /**
-     * Delegates to passed in grid predicate.
-     */
-    def apply(t1: T1, t2: T2, t3: T3): Boolean = {
-        inner.applyx(t1, t2, t3)
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicateFunction.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicateFunction.scala
 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicateFunction.scala
deleted file mode 100644
index f583d54..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicateFunction.scala
+++ /dev/null
@@ -1,34 +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.gridgain.scalar.lang
-
-import org.apache.ignite.lang.IgnitePredicate
-
-/**
- * Wrapping Scala function for `GridPredicate`.
- */
-class ScalarPredicateFunction[T](val inner: IgnitePredicate[T]) extends (T => 
Boolean) {
-    assert(inner != null)
-
-    /**
-     * Delegates to passed in grid predicate.
-     */
-    def apply(t: T): Boolean = {
-        inner.apply(t)
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicateX.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicateX.scala 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicateX.scala
deleted file mode 100644
index f5b0d33..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicateX.scala
+++ /dev/null
@@ -1,37 +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.gridgain.scalar.lang
-
-import org.apache.ignite._
-import org.gridgain.grid._
-import org.apache.ignite.internal.util.lang.IgnitePredicateX
-
-/**
- * Peer deploy aware adapter for Java's `GridPredicateX`.
- */
-class ScalarPredicateX[T](private val p: T => Boolean) extends 
IgnitePredicateX[T] {
-    assert(p != null)
-
-    /**
-     * Delegates to passed in function.
-     */
-    @throws(classOf[IgniteCheckedException])
-    def applyx(e: T): Boolean = {
-        p(e)
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicateXFunction.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicateXFunction.scala
 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicateXFunction.scala
deleted file mode 100644
index 7b26126..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicateXFunction.scala
+++ /dev/null
@@ -1,34 +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.gridgain.scalar.lang
-
-import org.apache.ignite.internal.util.lang.IgnitePredicateX
-
-/**
- * Wrapping Scala function for `GridPredicateX`.
- */
-class ScalarPredicateXFunction[T](val inner: IgnitePredicateX[T]) extends (T 
=> Boolean) {
-    assert(inner != null)
-
-    /**
-     * Delegates to passed in grid predicate.
-     */
-    def apply(t: T) = {
-        inner.applyx(t)
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarReducer.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarReducer.scala 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarReducer.scala
deleted file mode 100644
index 56645eb..0000000
--- a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarReducer.scala
+++ /dev/null
@@ -1,47 +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.gridgain.scalar.lang
-
-import org.apache.ignite.lang.IgniteReducer
-
-import collection._
-
-/**
- * Peer deploy aware adapter for Java's `GridReducer`.
- */
-class ScalarReducer[E, R](private val r: Seq[E] => R) extends IgniteReducer[E, 
R] {
-    assert(r != null)
-
-    private val buf = new mutable.ListBuffer[E]
-
-    /**
-     * Delegates to passed in function.
-     */
-    def reduce = r(buf.toSeq)
-
-    /**
-     * Collects given value.
-     *
-     * @param e Value to collect for later reduction.
-     */
-    def collect(e: E) = {
-        buf += e
-
-        true
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarReducer2.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarReducer2.scala 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarReducer2.scala
deleted file mode 100644
index f3f9377..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarReducer2.scala
+++ /dev/null
@@ -1,49 +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.gridgain.scalar.lang
-
-import collection._
-import org.apache.ignite.internal.util.lang.IgniteReducer2
-
-/**
- * Peer deploy aware adapter for Java's `GridReducer2`.
- */
-class ScalarReducer2[E1, E2, R](private val r: (Seq[E1], Seq[E2]) => R) 
extends IgniteReducer2[E1, E2, R] {
-    assert(r != null)
-
-    private val buf1 = new mutable.ListBuffer[E1]
-    private val buf2 = new mutable.ListBuffer[E2]
-
-    /**
-     * Delegates to passed in function.
-     */
-    def apply = r(buf1.toSeq, buf2.toSeq)
-
-    /**
-     * Collects given values.
-     *
-     * @param e1 Value to collect for later reduction.
-     * @param e2 Value to collect for later reduction.
-     */
-    def collect(e1: E1, e2: E2) = {
-        buf1 += e1
-        buf2 += e2
-
-        true
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarReducer2Function.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarReducer2Function.scala
 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarReducer2Function.scala
deleted file mode 100644
index 34818c1..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarReducer2Function.scala
+++ /dev/null
@@ -1,36 +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.gridgain.scalar.lang
-
-import org.apache.ignite.internal.util.lang.{IgniteReducer2}
-
-/**
- * Wrapping Scala function for `GridReducer2`.
- */
-class ScalarReducer2Function[E1, E2, R](val inner: IgniteReducer2[E1, E2, R]) 
extends ((Seq[E1], Seq[E2]) => R) {
-    assert(inner != null)
-
-    /**
-     * Delegates to passed in grid reducer.
-     */
-    def apply(s1: Seq[E1], s2: Seq[E2]) = {
-        for (e1 <- s1; e2 <- s2) inner.collect(e1, e2)
-
-        inner.apply()
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarReducer3.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarReducer3.scala 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarReducer3.scala
deleted file mode 100644
index 56761dc..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarReducer3.scala
+++ /dev/null
@@ -1,53 +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.gridgain.scalar.lang
-
-import collection._
-import org.apache.ignite.internal.util.lang.IgniteReducer3
-
-/**
- * Peer deploy aware adapter for Java's `GridReducer3`.
- */
-class ScalarReducer3[E1, E2, E3, R](private val r: (Seq[E1], Seq[E2], Seq[E3]) 
=> R)
-    extends IgniteReducer3[E1, E2, E3, R] {
-    assert(r != null)
-
-    private val buf1 = new mutable.ListBuffer[E1]
-    private val buf2 = new mutable.ListBuffer[E2]
-    private val buf3 = new mutable.ListBuffer[E3]
-
-    /**
-     * Delegates to passed in function.
-     */
-    def apply = r(buf1.toSeq, buf2.toSeq, buf3.toSeq)
-
-    /**
-     * Collects given values.
-     *
-     * @param e1 Value to collect for later reduction.
-     * @param e2 Value to collect for later reduction.
-     * @param e3 Value to collect for later reduction.
-     */
-    def collect(e1: E1, e2: E2, e3: E3) = {
-        buf1 += e1
-        buf2 += e2
-        buf3 += e3
-
-        true
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarReducer3Function.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarReducer3Function.scala
 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarReducer3Function.scala
deleted file mode 100644
index f697986..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarReducer3Function.scala
+++ /dev/null
@@ -1,37 +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.gridgain.scalar.lang
-
-import org.apache.ignite.internal.util.lang.{IgniteReducer3}
-
-/**
- * Wrapping Scala function for `GridReducer3`.
- */
-class ScalarReducer3Function[E1, E2, E3, R](val inner: IgniteReducer3[E1, E2, 
E3, R]) extends
-    ((Seq[E1], Seq[E2], Seq[E3]) => R) {
-    assert(inner != null)
-
-    /**
-     * Delegates to passed in grid reducer.
-     */
-    def apply(s1: Seq[E1], s2: Seq[E2], s3: Seq[E3]) = {
-        for (e1 <- s1; e2 <- s2; e3 <- s3) inner.collect(e1, e2, e3)
-
-        inner.apply()
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarReducerFunction.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarReducerFunction.scala
 
b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarReducerFunction.scala
deleted file mode 100644
index b0ad4c0..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarReducerFunction.scala
+++ /dev/null
@@ -1,36 +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.gridgain.scalar.lang
-
-import org.apache.ignite.lang.IgniteReducer
-
-/**
- * Wrapping Scala function for `GridReducer`.
- */
-class ScalarReducerFunction[E1, R](val inner: IgniteReducer[E1, R]) extends 
(Seq[E1] => R) {
-    assert(inner != null)
-
-    /**
-     * Delegates to passed in grid reducer.
-     */
-    def apply(s: Seq[E1]) = {
-        s foreach inner.collect _
-
-        inner.reduce()
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/Packet.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/Packet.scala 
b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/Packet.scala
deleted file mode 100644
index 79e5eb8..0000000
--- a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/Packet.scala
+++ /dev/null
@@ -1,23 +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.gridgain.scalar
-
-/**
- * Contains Scala "Pimp" implementations for main GridGain entities.
- */
-package object pimps
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/PimpedType.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/PimpedType.scala 
b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/PimpedType.scala
deleted file mode 100644
index 20dff39..0000000
--- a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/PimpedType.scala
+++ /dev/null
@@ -1,32 +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.gridgain.scalar.pimps
-
-/**
- * Sub class to create a wrapper type for `X` as documentation that the sub 
class follows the
- * 'pimp my library' pattern. 
http://www.artima.com/weblogs/viewpost.jsp?thread=179766
- * <p/>
- * The companion object provides an implicit conversion to unwrap `value`.
- */
-trait PimpedType[X] {
-    val value: X
-}
-
-object PimpedType {
-    implicit def UnwrapPimpedType[X](p: PimpedType[X]): X = p.value
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f9c9e6/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCachePimp.scala
----------------------------------------------------------------------
diff --git 
a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCachePimp.scala 
b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCachePimp.scala
deleted file mode 100644
index c5a60f5..0000000
--- 
a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCachePimp.scala
+++ /dev/null
@@ -1,69 +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.gridgain.scalar.pimps
-
-import org.apache.ignite.cache.GridCache
-
-/**
- * ==Overview==
- * Defines Scalar "pimp" for `GridCache` on Java side.
- *
- * Essentially this class extends Java `GridProjection` interface with Scala 
specific
- * API adapters using primarily implicit conversions defined in 
`ScalarConversions` object. What
- * it means is that you can use functions defined in this class on object
- * of Java `GridProjection` type. Scala will automatically (implicitly) 
convert it into
- * Scalar's pimp and replace the original call with a call on that pimp.
- *
- * Note that Scalar provide extensive library of implicit conversion between 
Java and
- * Scala GridGain counterparts in `ScalarConversions` object
- *
- * ==Suffix '$' In Names==
- * Symbol `$` is used in names when they conflict with the names in the base 
Java class
- * that Scala pimp is shadowing or with Java package name that your Scala code 
is importing.
- * Instead of giving two different names to the same function we've decided to 
simply mark
- * Scala's side method with `$` suffix.
- */
-class ScalarCachePimp[K, V] extends ScalarCacheProjectionPimp[K, V] with 
Ordered[GridCache[K, V]] {
-    /**
-     * Compares this cache name to the given cache name.
-     *
-     * @param that Another cache instance to compare names with.
-     */
-    def compare(that: GridCache[K, V]): Int = that.name.compareTo(value.name)
-}
-
-/**
- * Companion object.
- */
-object ScalarCachePimp {
-    /**
-     * Creates new Scalar cache pimp with given Java-side implementation.
-     *
-     * @param impl Java-side implementation.
-     */
-    def apply[K, V](impl: GridCache[K, V]) = {
-        if (impl == null)
-            throw new NullPointerException("impl")
-
-        val pimp = new ScalarCachePimp[K, V]
-
-        pimp.impl = impl
-
-        pimp
-    }
-}

Reply via email to