From 3c74dfc2ec4ef7f5944329c2e7bb3eab110b73de Mon Sep 17 00:00:00 2001 From: calvin1978 Date: Fri, 20 Jan 2017 09:37:00 +0800 Subject: [PATCH] rename --- .../org/springside/modules/utils/collection/SetUtil.java | 8 ++++---- .../modules/utils/concurrent/ConcurrentTools.java | 7 ++++--- .../utils/{misc => concurrent/throttle}/Sampler.java | 2 +- .../springside/modules/utils/collection/SetUtilTest.java | 8 ++++---- .../org/springside/modules/utils/misc/SamplerTest.java | 5 +++-- 5 files changed, 16 insertions(+), 14 deletions(-) rename modules/utils/src/main/java/org/springside/modules/utils/{misc => concurrent/throttle}/Sampler.java (96%) diff --git a/modules/utils/src/main/java/org/springside/modules/utils/collection/SetUtil.java b/modules/utils/src/main/java/org/springside/modules/utils/collection/SetUtil.java index 9ac48dc5..921b6e27 100644 --- a/modules/utils/src/main/java/org/springside/modules/utils/collection/SetUtil.java +++ b/modules/utils/src/main/java/org/springside/modules/utils/collection/SetUtil.java @@ -145,7 +145,7 @@ public abstract class SetUtil { * * 如果尝试写入该View会抛出UnsupportedOperationException */ - public static Set union(final Set set1, final Set set2) { + public static Set unionView(final Set set1, final Set set2) { return Sets.union(set1, set2); } @@ -154,7 +154,7 @@ public abstract class SetUtil { * * 如果尝试写入该View会抛出UnsupportedOperationException */ - public static Set intersection(final Set set1, final Set set2) { + public static Set intersectionView(final Set set1, final Set set2) { return Sets.intersection(set1, set2); } @@ -163,7 +163,7 @@ public abstract class SetUtil { * * 如果尝试写入该View会抛出UnsupportedOperationException */ - public static Set difference(final Set set1, final Set set2) { + public static Set differenceView(final Set set1, final Set set2) { return Sets.difference(set1, set2); } @@ -172,7 +172,7 @@ public abstract class SetUtil { * * 如果尝试写入该View会抛出UnsupportedOperationException */ - public static Set disjoint(final Set set1, final Set set2) { + public static Set disjointView(final Set set1, final Set set2) { return Sets.symmetricDifference(set1, set2); } } diff --git a/modules/utils/src/main/java/org/springside/modules/utils/concurrent/ConcurrentTools.java b/modules/utils/src/main/java/org/springside/modules/utils/concurrent/ConcurrentTools.java index 6b1058e7..3b6a081b 100644 --- a/modules/utils/src/main/java/org/springside/modules/utils/concurrent/ConcurrentTools.java +++ b/modules/utils/src/main/java/org/springside/modules/utils/concurrent/ConcurrentTools.java @@ -4,7 +4,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.CyclicBarrier; import org.springside.modules.utils.concurrent.jsr166e.LongAdder; -import org.springside.modules.utils.misc.Sampler; +import org.springside.modules.utils.concurrent.throttle.Sampler; import com.google.common.util.concurrent.RateLimiter; @@ -33,6 +33,7 @@ public class ConcurrentTools { return new CyclicBarrier(count); } + /////////// 限流采样 ////// /** * 返回漏桶算法的RateLimiter * @@ -41,13 +42,13 @@ public class ConcurrentTools { public static RateLimiter rateLimiter(int permitsPerSecond) { return RateLimiter.create(permitsPerSecond); } - + /** * 返回采样器. * * @param selectPercent 采样率，在0-100 之间，可以有小数位 */ - public static Sampler sampler(double selectPercent){ + public static Sampler sampler(double selectPercent) { return Sampler.create(selectPercent); } } diff --git a/modules/utils/src/main/java/org/springside/modules/utils/misc/Sampler.java b/modules/utils/src/main/java/org/springside/modules/utils/concurrent/throttle/Sampler.java similarity index 96% rename from modules/utils/src/main/java/org/springside/modules/utils/misc/Sampler.java rename to modules/utils/src/main/java/org/springside/modules/utils/concurrent/throttle/Sampler.java index 64c3e381..e91071c9 100644 --- a/modules/utils/src/main/java/org/springside/modules/utils/misc/Sampler.java +++ b/modules/utils/src/main/java/org/springside/modules/utils/concurrent/throttle/Sampler.java @@ -1,4 +1,4 @@ -package org.springside.modules.utils.misc; +package org.springside.modules.utils.concurrent.throttle; import org.apache.commons.lang3.Validate; import org.springside.modules.utils.number.RandomUtil; diff --git a/modules/utils/src/test/java/org/springside/modules/utils/collection/SetUtilTest.java b/modules/utils/src/test/java/org/springside/modules/utils/collection/SetUtilTest.java index 7c90771c..37096860 100644 --- a/modules/utils/src/test/java/org/springside/modules/utils/collection/SetUtilTest.java +++ b/modules/utils/src/test/java/org/springside/modules/utils/collection/SetUtilTest.java @@ -78,16 +78,16 @@ public class SetUtilTest { HashSet set1 = SetUtil.newHashSet("1", "2", "3", "6"); HashSet set2 = SetUtil.newHashSet("4", "5", "6", "7"); - Set set3 = SetUtil.union(set1, set2); + Set set3 = SetUtil.unionView(set1, set2); assertThat(set3).hasSize(7).contains("1", "2", "3", "4", "5", "6", "7"); - Set set4 = SetUtil.intersection(set1, set2); + Set set4 = SetUtil.intersectionView(set1, set2); assertThat(set4).hasSize(1).contains("6"); - Set set5 = SetUtil.difference(set1, set2); + Set set5 = SetUtil.differenceView(set1, set2); assertThat(set5).hasSize(3).contains("1", "2", "3"); - Set set6 = SetUtil.disjoint(set1, set2); + Set set6 = SetUtil.disjointView(set1, set2); assertThat(set6).hasSize(6).contains("1", "2", "3", "4", "5", "7"); try { diff --git a/modules/utils/src/test/java/org/springside/modules/utils/misc/SamplerTest.java b/modules/utils/src/test/java/org/springside/modules/utils/misc/SamplerTest.java index e24fd20d..bf55b136 100644 --- a/modules/utils/src/test/java/org/springside/modules/utils/misc/SamplerTest.java +++ b/modules/utils/src/test/java/org/springside/modules/utils/misc/SamplerTest.java @@ -3,8 +3,9 @@ package org.springside.modules.utils.misc; import static org.assertj.core.api.Assertions.*; import org.junit.Test; -import org.springside.modules.utils.misc.Sampler.AlwaysSampler; -import org.springside.modules.utils.misc.Sampler.NeverSampler; +import org.springside.modules.utils.concurrent.throttle.Sampler; +import org.springside.modules.utils.concurrent.throttle.Sampler.AlwaysSampler; +import org.springside.modules.utils.concurrent.throttle.Sampler.NeverSampler; public class SamplerTest {