You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/12/30 16:07:42 UTC
ignite git commit: IGNITE-2263: Minor refactorings.
Repository: ignite
Updated Branches:
refs/heads/ignite-2263 ec180d642 -> ba4ae7f30
IGNITE-2263: Minor refactorings.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ba4ae7f3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ba4ae7f3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ba4ae7f3
Branch: refs/heads/ignite-2263
Commit: ba4ae7f3096ad492ae98fc9ed742ea3890f09d07
Parents: ec180d6
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Dec 30 18:07:38 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Dec 30 18:07:38 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheIterator.java | 2 +-
.../distributed/near/GridNearCacheAdapter.java | 2 +-
.../dotnet/PlatformDotNetCacheStore.java | 4 +--
.../ignite/internal/util/lang/GridFunc.java | 31 ++++++++------------
.../java/org/apache/ignite/lang/IgniteUuid.java | 2 +-
5 files changed, 17 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ba4ae7f3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIterator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIterator.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIterator.java
index 48f5fe2..e4a471c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIterator.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIterator.java
@@ -59,7 +59,7 @@ public class GridCacheIterator<K, V, T> implements GridSerializableIterator<T> {
) {
this.cctx = cctx;
- it = F.identityIterator(c, false, F0.and(filter));
+ it = F.identityIterator(c, F0.and(filter));
this.trans = trans;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ba4ae7f3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
index 51f795a..5c48dc7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
@@ -559,7 +559,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda
/** {@inheritDoc} */
@NotNull @Override public Iterator<Cache.Entry<K, V>> iterator() {
return new EntryIterator(nearSet.iterator(),
- F.identityIterator(dhtSet, false, new P1<Cache.Entry<K, V>>() {
+ F.identityIterator(dhtSet, new P1<Cache.Entry<K, V>>() {
@Override
public boolean apply(Cache.Entry<K, V> e) {
try {
http://git-wip-us.apache.org/repos/asf/ignite/blob/ba4ae7f3/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
index 7e65c22..9f0fd3f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
@@ -235,13 +235,13 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor
@Override public Set<Entry<K, V>> entrySet() {
return new AbstractSet<Entry<K, V>>() {
@Override public Iterator<Entry<K, V>> iterator() {
- return F.iterator(entries, new C1<Cache.Entry<? extends K, ? extends V>, Entry<K, V>>() {
+ return F.iteratorReadOnly(entries, new C1<Cache.Entry<? extends K, ? extends V>, Entry<K, V>>() {
private static final long serialVersionUID = 0L;
@Override public Entry<K, V> apply(Cache.Entry<? extends K, ? extends V> entry) {
return new GridMapEntry<>(entry.getKey(), entry.getValue());
}
- }, true);
+ });
}
@Override public int size() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/ba4ae7f3/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
index 04b51de..73bc62b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
@@ -1353,7 +1353,7 @@ public class GridFunc {
@NotNull
@Override public Iterator<T> iterator() {
- return F.identityIterator(c, false, p);
+ return identityIterator(c, p);
}
@Override public int size() {
@@ -1385,7 +1385,7 @@ public class GridFunc {
return new GridSerializableCollection<T2>() {
@NotNull
@Override public Iterator<T2> iterator() {
- return F.<T1, T2>iterator(c, trans, true);
+ return F.<T1, T2>iteratorReadOnly(c, trans);
}
@Override public int size() {
@@ -1470,7 +1470,7 @@ public class GridFunc {
return new GridSerializableSet<Map.Entry<K, V>>() {
@NotNull
@Override public Iterator<Entry<K, V>> iterator() {
- return identityIterator(m.entrySet(), false, ep);
+ return identityIterator(m.entrySet(), ep);
}
@Override public int size() {
@@ -1546,7 +1546,7 @@ public class GridFunc {
@NotNull
@Override public Iterator<Entry<K, V1>> iterator() {
return new Iterator<Entry<K, V1>>() {
- private Iterator<Entry<K, V>> it = identityIterator(m.entrySet(), true);
+ private Iterator<Entry<K, V>> it = identityIteratorReadOnly(m.entrySet());
@Override public boolean hasNext() {
return it.hasNext();
@@ -1647,7 +1647,7 @@ public class GridFunc {
return new GridSerializableSet<Entry<K, V>>() {
@NotNull @Override public Iterator<Entry<K, V>> iterator() {
return new Iterator<Entry<K, V>>() {
- private Iterator<K> it = identityIterator(c, true);
+ private Iterator<K> it = identityIteratorReadOnly(c);
@Override public boolean hasNext() {
return it.hasNext();
@@ -1873,14 +1873,12 @@ public class GridFunc {
* Creates and returns iterator from given collection.
*
* @param c Input collection.
- * @param readOnly If {@code true}, then resulting iterator will not allow modifications
- * to the underlying collection.
* @param <T> Type of the collection elements.
* @return Iterator from given collection and optional filtering predicate.
*/
@SuppressWarnings({"unchecked"})
- public static <T> GridIterator<T> identityIterator(Iterable<? extends T> c, boolean readOnly) {
- return F.iterator(c, IDENTITY, readOnly);
+ public static <T> GridIterator<T> identityIteratorReadOnly(Iterable<? extends T> c) {
+ return iteratorReadOnly(c, IDENTITY);
}
/**
@@ -1891,16 +1889,13 @@ public class GridFunc {
* evaluate to {@code true} for.
*
* @param c Input collection.
- * @param readOnly If {@code true}, then resulting iterator will not allow modifications
- * to the underlying collection.
* @param p Optional filtering predicate.
* @param <T> Type of the collection elements.
* @return Iterator from given collection and optional filtering predicate.
*/
@SuppressWarnings({"unchecked"})
- public static <T> GridIterator<T> identityIterator(Iterable<? extends T> c, boolean readOnly,
- IgnitePredicate<? super T> p) {
- return iterator(c, IDENTITY, readOnly, p);
+ public static <T> GridIterator<T> identityIterator(Iterable<? extends T> c, IgnitePredicate<? super T> p) {
+ return iterator(c, IDENTITY, false, p);
}
/**
@@ -1908,17 +1903,15 @@ public class GridFunc {
*
* @param c Input collection.
* @param trans Transforming closure to convert from T1 to T2.
- * @param readOnly If {@code true}, then resulting iterator will not allow modifications
- * to the underlying collection.
* @param <T1> Type of the collection elements.
* @param <T2> Type of returned elements.
* @return Iterator from given collection and optional filtering predicate.
*/
- public static <T1, T2> GridIterator<T2> iterator(final Iterable<? extends T1> c,
- final IgniteClosure<? super T1, T2> trans, final boolean readOnly) {
+ public static <T1, T2> GridIterator<T2> iteratorReadOnly(final Iterable<? extends T1> c,
+ final IgniteClosure<? super T1, T2> trans) {
A.notNull(c, "c", trans, "trans");
- return iterator(c.iterator(), trans, readOnly);
+ return iterator(c.iterator(), trans, true);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/ba4ae7f3/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java
index 7904671..44ca067 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java
@@ -186,7 +186,7 @@ public final class IgniteUuid implements Comparable<IgniteUuid>, Iterable<Ignite
/** {@inheritDoc} */
@Override public GridIterator<IgniteUuid> iterator() {
- return F.identityIterator(Collections.singleton(this), true);
+ return F.identityIteratorReadOnly(Collections.singleton(this));
}
/** {@inheritDoc} */