[35/50] ignite git commit: IGNITE-3216 Need to deduplicate addresses registered in the IP finder
IGNITE-3216 Need to deduplicate addresses registered in the IP finder Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a4bbf0b7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a4bbf0b7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a4bbf0b7 Branch: refs/heads/ignite-3341 Commit: a4bbf0b70349fee39689b72c10e1c3dc26363c3f Parents: 5c3efa9 Author: Anton VinogradovAuthored: Thu Jun 16 10:25:38 2016 +0300 Committer: Anton Vinogradov Committed: Thu Jun 16 10:25:38 2016 +0300 -- .../ignite/internal/util/IgniteUtils.java | 8 +-- .../ignite/internal/util/lang/GridFunc.java | 64 .../internal/util/IgniteUtilsSelfTest.java | 15 + 3 files changed, 19 insertions(+), 68 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/a4bbf0b7/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index c898909..faf026b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -8550,7 +8550,7 @@ public abstract class IgniteUtils { */ public static Collection toInetAddresses(Collection addrs, Collection hostNames) throws IgniteCheckedException { -List res = new ArrayList<>(addrs.size()); +Set res = new HashSet<>(addrs.size()); Iterator hostNamesIt = hostNames.iterator(); @@ -8583,7 +8583,7 @@ public abstract class IgniteUtils { throw new IgniteCheckedException("Addresses can not be resolved [addr=" + addrs + ", hostNames=" + hostNames + ']'); -return F.viewListReadOnly(res, F.identity()); +return res; } /** @@ -8609,7 +8609,7 @@ public abstract class IgniteUtils { */ public static Collection toSocketAddresses(Collection addrs, Collection hostNames, int port) { -List res = new ArrayList<>(addrs.size()); +Set res = new HashSet<>(addrs.size()); Iterator hostNamesIt = hostNames.iterator(); @@ -8630,7 +8630,7 @@ public abstract class IgniteUtils { res.add(new InetSocketAddress(addr, port)); } -return F.viewListReadOnly(res, F.identity()); +return res; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/a4bbf0b7/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 8eeca6b..20e31c6 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 @@ -1695,70 +1695,6 @@ public class GridFunc { } /** - * Creates read-only light-weight view on given list with provided transformation. - * Resulting list will only "have" {@code transformed} elements. Note that only wrapping - * list will be created and no duplication of data will occur. - * - * @param c Input list that serves as a base for the view. - * @param trans Transformation closure. - * @param Type of the list. - * @return Light-weight view on given list with provided transformation. - */ -@SuppressWarnings("RedundantTypeArguments") -public static List viewListReadOnly(@Nullable final List c, -final IgniteClosure trans) { -A.notNull(trans, "trans"); - -if (isEmpty(c)) -return Collections.emptyList(); - -assert c != null; - -return new GridSerializableList() { -/** */ -private static final long serialVersionUID = 3126625219739967068L; - -@Override public T2 get(int idx) { -return trans.apply(c.get(idx)); -} - -@NotNull -@Override public Iterator iterator() { -return F. iterator(c, trans, true); -} - -@Override public int size() { -return c.size(); -} - -@Override public boolean isEmpty() { -return c.isEmpty(); -} -}; -} - -/** - * Creates a view on given list with provided transformer and predicates. - * Resulting list will only "have" elements for which all
[35/43] ignite git commit: IGNITE-3216 Need to deduplicate addresses registered in the IP finder
IGNITE-3216 Need to deduplicate addresses registered in the IP finder Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a4bbf0b7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a4bbf0b7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a4bbf0b7 Branch: refs/heads/ignite-3335 Commit: a4bbf0b70349fee39689b72c10e1c3dc26363c3f Parents: 5c3efa9 Author: Anton VinogradovAuthored: Thu Jun 16 10:25:38 2016 +0300 Committer: Anton Vinogradov Committed: Thu Jun 16 10:25:38 2016 +0300 -- .../ignite/internal/util/IgniteUtils.java | 8 +-- .../ignite/internal/util/lang/GridFunc.java | 64 .../internal/util/IgniteUtilsSelfTest.java | 15 + 3 files changed, 19 insertions(+), 68 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/a4bbf0b7/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index c898909..faf026b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -8550,7 +8550,7 @@ public abstract class IgniteUtils { */ public static Collection toInetAddresses(Collection addrs, Collection hostNames) throws IgniteCheckedException { -List res = new ArrayList<>(addrs.size()); +Set res = new HashSet<>(addrs.size()); Iterator hostNamesIt = hostNames.iterator(); @@ -8583,7 +8583,7 @@ public abstract class IgniteUtils { throw new IgniteCheckedException("Addresses can not be resolved [addr=" + addrs + ", hostNames=" + hostNames + ']'); -return F.viewListReadOnly(res, F.identity()); +return res; } /** @@ -8609,7 +8609,7 @@ public abstract class IgniteUtils { */ public static Collection toSocketAddresses(Collection addrs, Collection hostNames, int port) { -List res = new ArrayList<>(addrs.size()); +Set res = new HashSet<>(addrs.size()); Iterator hostNamesIt = hostNames.iterator(); @@ -8630,7 +8630,7 @@ public abstract class IgniteUtils { res.add(new InetSocketAddress(addr, port)); } -return F.viewListReadOnly(res, F.identity()); +return res; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/a4bbf0b7/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 8eeca6b..20e31c6 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 @@ -1695,70 +1695,6 @@ public class GridFunc { } /** - * Creates read-only light-weight view on given list with provided transformation. - * Resulting list will only "have" {@code transformed} elements. Note that only wrapping - * list will be created and no duplication of data will occur. - * - * @param c Input list that serves as a base for the view. - * @param trans Transformation closure. - * @param Type of the list. - * @return Light-weight view on given list with provided transformation. - */ -@SuppressWarnings("RedundantTypeArguments") -public static List viewListReadOnly(@Nullable final List c, -final IgniteClosure trans) { -A.notNull(trans, "trans"); - -if (isEmpty(c)) -return Collections.emptyList(); - -assert c != null; - -return new GridSerializableList() { -/** */ -private static final long serialVersionUID = 3126625219739967068L; - -@Override public T2 get(int idx) { -return trans.apply(c.get(idx)); -} - -@NotNull -@Override public Iterator iterator() { -return F. iterator(c, trans, true); -} - -@Override public int size() { -return c.size(); -} - -@Override public boolean isEmpty() { -return c.isEmpty(); -} -}; -} - -/** - * Creates a view on given list with provided transformer and predicates. - * Resulting list will only "have" elements for which all
[35/41] ignite git commit: IGNITE-3216 Need to deduplicate addresses registered in the IP finder
IGNITE-3216 Need to deduplicate addresses registered in the IP finder Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a4bbf0b7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a4bbf0b7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a4bbf0b7 Branch: refs/heads/ignite-3331 Commit: a4bbf0b70349fee39689b72c10e1c3dc26363c3f Parents: 5c3efa9 Author: Anton VinogradovAuthored: Thu Jun 16 10:25:38 2016 +0300 Committer: Anton Vinogradov Committed: Thu Jun 16 10:25:38 2016 +0300 -- .../ignite/internal/util/IgniteUtils.java | 8 +-- .../ignite/internal/util/lang/GridFunc.java | 64 .../internal/util/IgniteUtilsSelfTest.java | 15 + 3 files changed, 19 insertions(+), 68 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/a4bbf0b7/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index c898909..faf026b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -8550,7 +8550,7 @@ public abstract class IgniteUtils { */ public static Collection toInetAddresses(Collection addrs, Collection hostNames) throws IgniteCheckedException { -List res = new ArrayList<>(addrs.size()); +Set res = new HashSet<>(addrs.size()); Iterator hostNamesIt = hostNames.iterator(); @@ -8583,7 +8583,7 @@ public abstract class IgniteUtils { throw new IgniteCheckedException("Addresses can not be resolved [addr=" + addrs + ", hostNames=" + hostNames + ']'); -return F.viewListReadOnly(res, F.identity()); +return res; } /** @@ -8609,7 +8609,7 @@ public abstract class IgniteUtils { */ public static Collection toSocketAddresses(Collection addrs, Collection hostNames, int port) { -List res = new ArrayList<>(addrs.size()); +Set res = new HashSet<>(addrs.size()); Iterator hostNamesIt = hostNames.iterator(); @@ -8630,7 +8630,7 @@ public abstract class IgniteUtils { res.add(new InetSocketAddress(addr, port)); } -return F.viewListReadOnly(res, F.identity()); +return res; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/a4bbf0b7/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 8eeca6b..20e31c6 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 @@ -1695,70 +1695,6 @@ public class GridFunc { } /** - * Creates read-only light-weight view on given list with provided transformation. - * Resulting list will only "have" {@code transformed} elements. Note that only wrapping - * list will be created and no duplication of data will occur. - * - * @param c Input list that serves as a base for the view. - * @param trans Transformation closure. - * @param Type of the list. - * @return Light-weight view on given list with provided transformation. - */ -@SuppressWarnings("RedundantTypeArguments") -public static List viewListReadOnly(@Nullable final List c, -final IgniteClosure trans) { -A.notNull(trans, "trans"); - -if (isEmpty(c)) -return Collections.emptyList(); - -assert c != null; - -return new GridSerializableList() { -/** */ -private static final long serialVersionUID = 3126625219739967068L; - -@Override public T2 get(int idx) { -return trans.apply(c.get(idx)); -} - -@NotNull -@Override public Iterator iterator() { -return F. iterator(c, trans, true); -} - -@Override public int size() { -return c.size(); -} - -@Override public boolean isEmpty() { -return c.isEmpty(); -} -}; -} - -/** - * Creates a view on given list with provided transformer and predicates. - * Resulting list will only "have" elements for which all
[11/13] ignite git commit: IGNITE-3216 Need to deduplicate addresses registered in the IP finder
IGNITE-3216 Need to deduplicate addresses registered in the IP finder Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/40d41c10 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/40d41c10 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/40d41c10 Branch: refs/heads/master Commit: 40d41c10e3179436bc1ae1e12bdc2d6e3a7208f0 Parents: b5f4aac Author: Anton VinogradovAuthored: Thu Jun 16 10:25:38 2016 +0300 Committer: Anton Vinogradov Committed: Thu Jun 16 14:23:05 2016 +0300 -- .../ignite/internal/util/IgniteUtils.java | 8 +-- .../ignite/internal/util/lang/GridFunc.java | 66 .../internal/util/IgniteUtilsSelfTest.java | 15 + 3 files changed, 19 insertions(+), 70 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/40d41c10/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index 1147124..2a83ad4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -8581,7 +8581,7 @@ public abstract class IgniteUtils { */ public static Collection toInetAddresses(Collection addrs, Collection hostNames) throws IgniteCheckedException { -List res = new ArrayList<>(addrs.size()); +Set res = new HashSet<>(addrs.size()); Iterator hostNamesIt = hostNames.iterator(); @@ -8614,7 +8614,7 @@ public abstract class IgniteUtils { throw new IgniteCheckedException("Addresses can not be resolved [addr=" + addrs + ", hostNames=" + hostNames + ']'); -return Collections.unmodifiableList(res); +return res; } /** @@ -8640,7 +8640,7 @@ public abstract class IgniteUtils { */ public static Collection toSocketAddresses(Collection addrs, Collection hostNames, int port) { -List res = new ArrayList<>(addrs.size()); +Set res = new HashSet<>(addrs.size()); Iterator hostNamesIt = hostNames.iterator(); @@ -8661,7 +8661,7 @@ public abstract class IgniteUtils { res.add(new InetSocketAddress(addr, port)); } -return Collections.unmodifiableList(res); +return res; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/40d41c10/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 ab31625..6ad136c 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 @@ -1715,72 +1715,6 @@ public class GridFunc { } /** - * Creates read-only light-weight view on given list with provided transformation. - * Resulting list will only "have" {@code transformed} elements. Note that only wrapping - * list will be created and no duplication of data will occur. - * - * @param c Input list that serves as a base for the view. - * @param trans Transformation closure. - * @param Type of the list. - * @return Light-weight view on given list with provided transformation. - */ -@SuppressWarnings("RedundantTypeArguments") -@Deprecated -public static List viewListReadOnly(@Nullable final List c, -final IgniteClosure trans) { -A.notNull(trans, "trans"); - -if (isEmpty(c)) -return Collections.emptyList(); - -assert c != null; - -return new GridSerializableList() { -/** */ -private static final long serialVersionUID = 3126625219739967068L; - -@Override public T2 get(int idx) { -return trans.apply(c.get(idx)); -} - -@NotNull -@Override public Iterator iterator() { -return F. iterator(c, trans, true); -} - -@Override public int size() { -return c.size(); -} - -@Override public boolean isEmpty() { -return c.isEmpty(); -} -}; -} - -/** - * Creates a view on given list with provided transformer and predicates. - * Resulting list will only "have" elements for which all
ignite git commit: IGNITE-3216
Repository: ignite Updated Branches: refs/heads/ignite-3216 b563a4870 -> 43fbbeb5c IGNITE-3216 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/43fbbeb5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/43fbbeb5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/43fbbeb5 Branch: refs/heads/ignite-3216 Commit: 43fbbeb5c965272d64dedc480e1560b4aebd517a Parents: b563a48 Author: Anton VinogradovAuthored: Thu Jun 9 16:28:36 2016 +0300 Committer: Anton Vinogradov Committed: Thu Jun 9 16:28:36 2016 +0300 -- .../main/java/org/apache/ignite/internal/util/IgniteUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/43fbbeb5/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index 18239b9..faf026b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -8583,7 +8583,7 @@ public abstract class IgniteUtils { throw new IgniteCheckedException("Addresses can not be resolved [addr=" + addrs + ", hostNames=" + hostNames + ']'); -return Collections.unmodifiableCollection(res); +return res; } /** @@ -8630,7 +8630,7 @@ public abstract class IgniteUtils { res.add(new InetSocketAddress(addr, port)); } -return Collections.unmodifiableCollection(res); +return res; } /**
ignite git commit: IGNITE-3216
Repository: ignite Updated Branches: refs/heads/ignite-3216 9bf004690 -> b563a4870 IGNITE-3216 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b563a487 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b563a487 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b563a487 Branch: refs/heads/ignite-3216 Commit: b563a487094fd309c0da569d8d73afc40ab6bb0c Parents: 9bf0046 Author: Anton VinogradovAuthored: Wed Jun 8 18:21:31 2016 +0300 Committer: Anton Vinogradov Committed: Wed Jun 8 18:21:31 2016 +0300 -- .../main/java/org/apache/ignite/internal/util/IgniteUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/b563a487/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index 012d001..18239b9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -8583,7 +8583,7 @@ public abstract class IgniteUtils { throw new IgniteCheckedException("Addresses can not be resolved [addr=" + addrs + ", hostNames=" + hostNames + ']'); -return F.viewSetReadOnly(res, F.identity()); +return Collections.unmodifiableCollection(res); } /** @@ -8630,7 +8630,7 @@ public abstract class IgniteUtils { res.add(new InetSocketAddress(addr, port)); } -return F.viewSetReadOnly(res, F.identity()); +return Collections.unmodifiableCollection(res); } /**
ignite git commit: IGNITE-3216
Repository: ignite Updated Branches: refs/heads/ignite-3216 efdd7b346 -> 9bf004690 IGNITE-3216 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9bf00469 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9bf00469 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9bf00469 Branch: refs/heads/ignite-3216 Commit: 9bf004690d008d08337f461c8b86c20ceba98d60 Parents: efdd7b3 Author: Anton VinogradovAuthored: Tue Jun 7 10:21:48 2016 +0300 Committer: Anton Vinogradov Committed: Tue Jun 7 10:21:48 2016 +0300 -- .../ignite/internal/util/IgniteUtilsSelfTest.java| 15 +++ 1 file changed, 15 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/9bf00469/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java index 520fa76..d774065 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java @@ -742,6 +742,21 @@ public class IgniteUtilsSelfTest extends GridCommonAbstractTest { } /** + * + */ +public void testToSocketAddressesNoDuplicates() { +Collection addrs = new ArrayList<>(); + +addrs.add("127.0.0.1"); +addrs.add("localhost"); + +Collection hostNames = new ArrayList<>(); +int port = 1234; + +assertEquals(1, U.toSocketAddresses(addrs, hostNames, port).size()); +} + +/** * Test enum. */ private enum TestEnum {
[17/17] ignite git commit: IGNITE-3216
IGNITE-3216 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/efdd7b34 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/efdd7b34 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/efdd7b34 Branch: refs/heads/ignite-3216 Commit: efdd7b346349e71083edcfc547d4fd5a5aef5d9b Parents: 5254957 Author: Anton VinogradovAuthored: Mon Jun 6 19:02:43 2016 +0300 Committer: Anton Vinogradov Committed: Mon Jun 6 19:02:43 2016 +0300 -- .../org/apache/ignite/internal/util/IgniteUtils.java | 8 .../apache/ignite/internal/util/lang/GridFunc.java| 14 +- 2 files changed, 9 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/efdd7b34/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index c898909..012d001 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -8550,7 +8550,7 @@ public abstract class IgniteUtils { */ public static Collection toInetAddresses(Collection addrs, Collection hostNames) throws IgniteCheckedException { -List res = new ArrayList<>(addrs.size()); +Set res = new HashSet<>(addrs.size()); Iterator hostNamesIt = hostNames.iterator(); @@ -8583,7 +8583,7 @@ public abstract class IgniteUtils { throw new IgniteCheckedException("Addresses can not be resolved [addr=" + addrs + ", hostNames=" + hostNames + ']'); -return F.viewListReadOnly(res, F.identity()); +return F.viewSetReadOnly(res, F.identity()); } /** @@ -8609,7 +8609,7 @@ public abstract class IgniteUtils { */ public static Collection toSocketAddresses(Collection addrs, Collection hostNames, int port) { -List res = new ArrayList<>(addrs.size()); +Set res = new HashSet<>(addrs.size()); Iterator hostNamesIt = hostNames.iterator(); @@ -8630,7 +8630,7 @@ public abstract class IgniteUtils { res.add(new InetSocketAddress(addr, port)); } -return F.viewListReadOnly(res, F.identity()); +return F.viewSetReadOnly(res, F.identity()); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/efdd7b34/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 8eeca6b..39052dd 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 @@ -1695,33 +1695,29 @@ public class GridFunc { } /** - * Creates read-only light-weight view on given list with provided transformation. + * Creates read-only light-weight view on given set with provided transformation. * Resulting list will only "have" {@code transformed} elements. Note that only wrapping * list will be created and no duplication of data will occur. * * @param c Input list that serves as a base for the view. * @param trans Transformation closure. * @param Type of the list. - * @return Light-weight view on given list with provided transformation. + * @return Light-weight view on given set with provided transformation. */ @SuppressWarnings("RedundantTypeArguments") -public static List viewListReadOnly(@Nullable final List c, +public static Set viewSetReadOnly(@Nullable final Set c, final IgniteClosure trans) { A.notNull(trans, "trans"); if (isEmpty(c)) -return Collections.emptyList(); +return Collections.emptySet(); assert c != null; -return new GridSerializableList() { +return new GridSerializableSet() { /** */ private static final long serialVersionUID = 3126625219739967068L; -@Override public T2 get(int idx) { -return trans.apply(c.get(idx)); -} - @NotNull @Override public Iterator iterator() { return F. iterator(c, trans, true);