zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Reduce dependence]>[Iterators] Replace "google.common.collect.*" API with jdk API (#6447)

Browse Source
This commit is contained in:
ZZQ的 2021-07-26 09:29:43 +08:00 committed by GitHub
parent 54408d49b3
commit c52589fd03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
common/src/test/java/com/alibaba/nacos/common/utils/CollectionUtilsTest.java
View File

@ -17,7 +17,6 @@
package com.alibaba.nacos.common.utils; package com.alibaba.nacos.common.utils;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterators;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
@ -25,6 +24,8 @@ import org.mockito.internal.util.collections.Sets;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.Vector; import java.util.Vector;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.IntStream; import java.util.stream.IntStream;
@ -136,12 +137,12 @@ public class CollectionUtilsTest {
@Test(expected = IndexOutOfBoundsException.class) @Test(expected = IndexOutOfBoundsException.class)
public void testGetEnumeration1() { public void testGetEnumeration1() {
CollectionUtils.get(Iterators.asEnumeration(Collections.emptyIterator()), 0); CollectionUtils.get(asEnumeration(Collections.emptyIterator()), 0);
} }
@Test(expected = IndexOutOfBoundsException.class) @Test(expected = IndexOutOfBoundsException.class)
public void testGetEnumeration2() { public void testGetEnumeration2() {
CollectionUtils.get(Iterators.asEnumeration(Collections.emptyIterator()), -1); CollectionUtils.get(asEnumeration(Collections.emptyIterator()), -1);
} }
@Test @Test
@ -194,8 +195,8 @@ public class CollectionUtilsTest {
Assert.assertEquals(2, CollectionUtils.size(Arrays.asList("1", "2").iterator())); Assert.assertEquals(2, CollectionUtils.size(Arrays.asList("1", "2").iterator()));
// enumeration // enumeration
Assert.assertEquals(0, CollectionUtils.size(Iterators.asEnumeration(Collections.emptyIterator()))); Assert.assertEquals(0, CollectionUtils.size(asEnumeration(Collections.emptyIterator())));
Assert.assertEquals(1, CollectionUtils.size(Iterators.asEnumeration(Collections.singleton("").iterator()))); Assert.assertEquals(1, CollectionUtils.size(asEnumeration(Collections.singleton("").iterator())));
} }
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
@ -231,8 +232,8 @@ public class CollectionUtilsTest {
Assert.assertFalse(CollectionUtils.sizeIsEmpty(Arrays.asList("1", "2").iterator())); Assert.assertFalse(CollectionUtils.sizeIsEmpty(Arrays.asList("1", "2").iterator()));
// enumeration // enumeration
Assert.assertTrue(CollectionUtils.sizeIsEmpty(Iterators.asEnumeration(Collections.emptyIterator()))); Assert.assertTrue(CollectionUtils.sizeIsEmpty(asEnumeration(Collections.emptyIterator())));
Assert.assertFalse(CollectionUtils.sizeIsEmpty(Iterators.asEnumeration(Collections.singleton("").iterator()))); Assert.assertFalse(CollectionUtils.sizeIsEmpty(asEnumeration(Collections.singleton("").iterator())));
} }
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
@ -271,4 +272,19 @@ public class CollectionUtilsTest {
Assert.assertEquals("element", Assert.assertEquals("element",
CollectionUtils.getOrDefault(Collections.singletonList("element"), 0, "default")); CollectionUtils.getOrDefault(Collections.singletonList("element"), 0, "default"));
} }
private <T> Enumeration<T> asEnumeration(final Iterator<T> iterator) {
if (iterator == null) {
throw new IllegalArgumentException("iterator cannot be null ");
}
return new Enumeration<T>() {
public boolean hasMoreElements() {
return iterator.hasNext();
}
public T nextElement() {
return iterator.next();
}
};
}
} }