From d7082df2d3a0f10273d0b82e4b44dbee3b73d37b Mon Sep 17 00:00:00 2001 From: "calvin.xiao" Date: Sat, 31 Dec 2016 00:01:55 +0800 Subject: [PATCH] =?UTF-8?q?#525=20=E5=8A=A0=E5=BC=BAUtils=20Modules?= =?UTF-8?q?=E6=A8=A1=E5=9D=97:=20Exceptions=EF=BC=8CLists=E5=88=9D?= =?UTF-8?q?=E6=AD=A5=E5=AE=8C=E6=88=90=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bootapi/service/AccountService.java | 8 +- .../bootapi/service/BookAdminService.java | 2 +- .../bootapi/service/BookBorrowService.java | 2 +- .../springside/modules/mapper/JaxbMapper.java | 4 +- .../modules/metrics/metric/Histogram.java | 9 +- modules/pom.xml | 4 +- .../springside/modules/utils/Exceptions.java | 74 ----- .../modules/utils/base/Exceptions.java | 156 ++++++++++ .../modules/utils/{ => base}/Ids.java | 12 +- .../modules/utils/{ => base}/Numbers.java | 2 +- .../modules/utils/{ => base}/Reflections.java | 2 +- .../utils/collection/CollectionExtractor.java | 93 ++++++ .../modules/utils/collection/Collections.java | 107 +++++++ .../utils/collection/Collections3.java | 241 ---------------- .../modules/utils/collection/Lists.java | 187 ++++++++++++ .../modules/utils/collection/Maps.java | 23 ++ .../{thread => concurrent}/ThreadDumper.java | 2 +- .../ThreadLocalContext.java | 2 +- .../ThreadPoolBuilder.java | 6 +- .../utils/{thread => concurrent}/Threads.java | 3 +- .../modules/utils/{ => text}/Encodes.java | 76 ++--- .../springside/modules/utils/text/Hashs.java | 272 ++++++++++++++++++ .../utils/{ => text}/StringBuilderHolder.java | 2 +- .../modules/utils/{ => time}/Clock.java | 2 +- .../utils/{ => base}/ExceptionsTest.java | 5 +- .../modules/utils/{ => base}/IdsTest.java | 5 +- .../utils/{ => base}/ReflectionsTest.java | 3 +- ...Test.java => CollectionExtractorTest.java} | 12 +- .../{thread => concurrent}/ThreadsTest.java | 4 +- .../modules/utils/{ => text}/EncodesTest.java | 3 +- 30 files changed, 932 insertions(+), 391 deletions(-) delete mode 100644 modules/utils/src/main/java/org/springside/modules/utils/Exceptions.java create mode 100644 modules/utils/src/main/java/org/springside/modules/utils/base/Exceptions.java rename modules/utils/src/main/java/org/springside/modules/utils/{ => base}/Ids.java (76%) rename modules/utils/src/main/java/org/springside/modules/utils/{ => base}/Numbers.java (92%) rename modules/utils/src/main/java/org/springside/modules/utils/{ => base}/Reflections.java (99%) create mode 100644 modules/utils/src/main/java/org/springside/modules/utils/collection/CollectionExtractor.java create mode 100644 modules/utils/src/main/java/org/springside/modules/utils/collection/Collections.java delete mode 100644 modules/utils/src/main/java/org/springside/modules/utils/collection/Collections3.java create mode 100644 modules/utils/src/main/java/org/springside/modules/utils/collection/Lists.java create mode 100644 modules/utils/src/main/java/org/springside/modules/utils/collection/Maps.java rename modules/utils/src/main/java/org/springside/modules/utils/{thread => concurrent}/ThreadDumper.java (98%) rename modules/utils/src/main/java/org/springside/modules/utils/{thread => concurrent}/ThreadLocalContext.java (94%) rename modules/utils/src/main/java/org/springside/modules/utils/{thread => concurrent}/ThreadPoolBuilder.java (97%) rename modules/utils/src/main/java/org/springside/modules/utils/{thread => concurrent}/Threads.java (96%) rename modules/utils/src/main/java/org/springside/modules/utils/{ => text}/Encodes.java (60%) create mode 100644 modules/utils/src/main/java/org/springside/modules/utils/text/Hashs.java rename modules/utils/src/main/java/org/springside/modules/utils/{ => text}/StringBuilderHolder.java (95%) rename modules/utils/src/main/java/org/springside/modules/utils/{ => time}/Clock.java (97%) rename modules/utils/src/test/java/org/springside/modules/utils/{ => base}/ExceptionsTest.java (91%) rename modules/utils/src/test/java/org/springside/modules/utils/{ => base}/IdsTest.java (77%) rename modules/utils/src/test/java/org/springside/modules/utils/{ => base}/ReflectionsTest.java (98%) rename modules/utils/src/test/java/org/springside/modules/utils/collection/{Collecitons3Test.java => CollectionExtractorTest.java} (77%) rename modules/utils/src/test/java/org/springside/modules/utils/{thread => concurrent}/ThreadsTest.java (96%) rename modules/utils/src/test/java/org/springside/modules/utils/{ => text}/EncodesTest.java (94%) diff --git a/examples/boot-api/src/main/java/org/springside/examples/bootapi/service/AccountService.java b/examples/boot-api/src/main/java/org/springside/examples/bootapi/service/AccountService.java index 5f63dcaf..ea247b7f 100644 --- a/examples/boot-api/src/main/java/org/springside/examples/bootapi/service/AccountService.java +++ b/examples/boot-api/src/main/java/org/springside/examples/bootapi/service/AccountService.java @@ -16,9 +16,9 @@ import org.springside.examples.bootapi.domain.Account; import org.springside.examples.bootapi.repository.AccountDao; import org.springside.examples.bootapi.service.exception.ErrorCode; import org.springside.examples.bootapi.service.exception.ServiceException; -import org.springside.modules.utils.Digests; -import org.springside.modules.utils.Encodes; -import org.springside.modules.utils.Ids; +import org.springside.modules.utils.text.Hashs; +import org.springside.modules.utils.base.Ids; +import org.springside.modules.utils.text.Encodes; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; @@ -103,6 +103,6 @@ public class AccountService { } protected static String hashPassword(String password) { - return Encodes.encodeBase64(Digests.sha1(password)); + return Encodes.encodeBase64(Hashs.sha1(password)); } } diff --git a/examples/boot-api/src/main/java/org/springside/examples/bootapi/service/BookAdminService.java b/examples/boot-api/src/main/java/org/springside/examples/bootapi/service/BookAdminService.java index 0f7aac46..19463494 100644 --- a/examples/boot-api/src/main/java/org/springside/examples/bootapi/service/BookAdminService.java +++ b/examples/boot-api/src/main/java/org/springside/examples/bootapi/service/BookAdminService.java @@ -13,7 +13,7 @@ import org.springside.examples.bootapi.domain.Book; import org.springside.examples.bootapi.repository.BookDao; import org.springside.examples.bootapi.service.exception.ErrorCode; import org.springside.examples.bootapi.service.exception.ServiceException; -import org.springside.modules.utils.Clock; +import org.springside.modules.utils.time.Clock; // Spring Bean的标识. @Service diff --git a/examples/boot-api/src/main/java/org/springside/examples/bootapi/service/BookBorrowService.java b/examples/boot-api/src/main/java/org/springside/examples/bootapi/service/BookBorrowService.java index 257d067a..6d681a2a 100644 --- a/examples/boot-api/src/main/java/org/springside/examples/bootapi/service/BookBorrowService.java +++ b/examples/boot-api/src/main/java/org/springside/examples/bootapi/service/BookBorrowService.java @@ -15,7 +15,7 @@ import org.springside.examples.bootapi.repository.BookDao; import org.springside.examples.bootapi.repository.MessageDao; import org.springside.examples.bootapi.service.exception.ErrorCode; import org.springside.examples.bootapi.service.exception.ServiceException; -import org.springside.modules.utils.Clock; +import org.springside.modules.utils.time.Clock; // Spring Bean的标识. @Service diff --git a/modules/core/src/main/java/org/springside/modules/mapper/JaxbMapper.java b/modules/core/src/main/java/org/springside/modules/mapper/JaxbMapper.java index 1bbc1e88..ee05d5a3 100644 --- a/modules/core/src/main/java/org/springside/modules/mapper/JaxbMapper.java +++ b/modules/core/src/main/java/org/springside/modules/mapper/JaxbMapper.java @@ -21,8 +21,8 @@ import javax.xml.namespace.QName; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; -import org.springside.modules.utils.Exceptions; -import org.springside.modules.utils.Reflections; +import org.springside.modules.utils.base.Exceptions; +import org.springside.modules.utils.base.Reflections; /** * 使用Jaxb2.0实现XML<->Java Object的Mapper. diff --git a/modules/metrics/src/main/java/org/springside/modules/metrics/metric/Histogram.java b/modules/metrics/src/main/java/org/springside/modules/metrics/metric/Histogram.java index 386dd0d4..2d582669 100755 --- a/modules/metrics/src/main/java/org/springside/modules/metrics/metric/Histogram.java +++ b/modules/metrics/src/main/java/org/springside/modules/metrics/metric/Histogram.java @@ -20,7 +20,7 @@ public class Histogram { public HistogramMetric latestMetric;// Snapshot值 - private Double[] pcts; // 配置需要计算的百分位,如99, 99.99. + private Double[] pcts; // 配置需要计算的百分位,如99, 99.99 private int sampleRate; // 采样率,1代表100%, 2代表50%, 10 代表10% private AtomicInteger sampleCounter = new AtomicInteger(0); // 采样率取模用的计数器 @@ -46,10 +46,12 @@ public class Histogram { public void update(long value) { if (sampleRate == 1) { + //没有采样率 synchronized (this) { measurements.add(value); } } else if (sampleCounter.incrementAndGet() % sampleRate == 0) { + //有采样率且命中采样 synchronized (this) { measurements.add(value); } @@ -90,7 +92,7 @@ public class Histogram { metric.pcts.put(pct, getPercent(snapshotList, count, pct)); } } else { - // 不排序的算法,因为不需要支持百分比过滤 + // 不排序的算法,因为不需要支持百分位数 metric.min = snapshotList.get(0); metric.max = metric.min; @@ -144,6 +146,9 @@ public class Histogram { this.latestMetric = createEmptyMetric(); } + /** + * 配置需要计算的百分位,如99, 99.99 + */ public void setPcts(Double[] pcts) { this.pcts = pcts; } diff --git a/modules/pom.xml b/modules/pom.xml index ae7fad58..7af7fb9c 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -10,8 +10,8 @@ 4.1.8.RELEASE 5.0.0-SNAPSHOT - 18.0 - 3.4 + 20.0 + 3.5 1.10 2.4 1.9.2 diff --git a/modules/utils/src/main/java/org/springside/modules/utils/Exceptions.java b/modules/utils/src/main/java/org/springside/modules/utils/Exceptions.java deleted file mode 100644 index 7a7c1244..00000000 --- a/modules/utils/src/main/java/org/springside/modules/utils/Exceptions.java +++ /dev/null @@ -1,74 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2014 springside.github.io - * - * Licensed under the Apache License, Version 2.0 (the "License"); - *******************************************************************************/ -package org.springside.modules.utils; - -import java.io.PrintWriter; -import java.io.StringWriter; - -/** - * 关于异常的工具类. - * - * 参考了guava的Throwables. - */ -public class Exceptions { - - /** - * 将CheckedException转换为UncheckedException. - */ - public static RuntimeException unchecked(Throwable ex) { - if (ex instanceof RuntimeException) { - return (RuntimeException) ex; - } else { - return new RuntimeException(ex); - } - } - - /** - * 将ErrorStack转化为String. - */ - public static String getStackTraceAsString(Throwable ex) { - StringWriter stringWriter = new StringWriter(); - ex.printStackTrace(new PrintWriter(stringWriter)); - return stringWriter.toString(); - } - - /** - * 获取组合本异常信息与底层异常信息的异常描述, 适用于本异常为统一包装异常类,底层异常才是根本原因的情况。 - */ - public static String getErrorMessageWithNestedException(Throwable ex) { - Throwable nestedException = ex.getCause(); - return new StringBuilder().append(ex.getMessage()).append(" nested exception is ") - .append(nestedException.getClass().getName()).append(":").append(nestedException.getMessage()) - .toString(); - } - - /** - * 获取异常的Root Cause. - */ - public static Throwable getRootCause(Throwable ex) { - Throwable cause; - while ((cause = ex.getCause()) != null) { - ex = cause; - } - return ex; - } - - /** - * 判断异常是否由某些底层的异常引起. - */ - public static boolean isCausedBy(Exception ex, Class... causeExceptionClasses) { - Throwable cause = ex; - while (cause != null) { - for (Class causeClass : causeExceptionClasses) { - if (causeClass.isInstance(cause)) { - return true; - } - } - cause = cause.getCause(); - } - return false; - } -} diff --git a/modules/utils/src/main/java/org/springside/modules/utils/base/Exceptions.java b/modules/utils/src/main/java/org/springside/modules/utils/base/Exceptions.java new file mode 100644 index 00000000..5650eda1 --- /dev/null +++ b/modules/utils/src/main/java/org/springside/modules/utils/base/Exceptions.java @@ -0,0 +1,156 @@ +/******************************************************************************* + * Copyright (c) 2005, 2017 springside.github.io + * + * Licensed under the Apache License, Version 2.0 (the "License"); + *******************************************************************************/ +package org.springside.modules.utils.base; + +import org.apache.commons.lang3.exception.ExceptionUtils; + +import com.google.common.base.Throwables; + +/** + * 关于异常的工具类. + */ +public class Exceptions { + + private static final StackTraceElement[] EMPTY_STACK_TRACE = new StackTraceElement[0]; + + /** + * 将CheckedException转换为RuntimeException, Error则不变. 可减少CheckExcetpion造成的函数定义污染. + */ + public static RuntimeException unchecked(Throwable t) { + if (t instanceof RuntimeException) + throw ((RuntimeException) t); + if (t instanceof Error) + throw ((Error) t); + else + throw new RuntimeException(t); + } + + /** + * 参考Netty, 为静态异常设置StackTrace. + * + * 对某些已知且经常抛出的异常, 不需要每次创建异常类并很消耗性能的并生成完整的StackTrace. 此时可使用静态声明的异常. + * + * 如果异常可能在多个地方抛出,使用本函数设置抛出的类名和方法名. + * + *
+	 * private static TimeoutException TIMEOUT_EXCEPTION = staticStackTrace(new TimeOutException(), MyClass.class,
+	 * 		"hello");
+	 * 
+ */ + public static T setStackTrace(T exception, Class throwClass, String throwClazz) { + exception.setStackTrace( + new StackTraceElement[] { new StackTraceElement(throwClass.getName(), throwClazz, null, -1) }); + return exception; + } + + /** + * 清除StackTrace + */ + public static T clearStackTrace(T exception) { + exception.setStackTrace(EMPTY_STACK_TRACE); + return exception; + } + + /** + * 将StackTrace[]转换为String. + * + * @see Throwables#getStackTraceAsString(Throwable) + */ + public static String stackTraceText(Throwable t) { + return Throwables.getStackTraceAsString(t); + } + + /** + * 获取异常的Root Cause. + * + * @see Throwables#getRootCause(Throwable) + */ + public static Throwable getRootCause(Throwable t) { + return Throwables.getRootCause(t); + } + + /** + * 判断异常是否由某些底层的异常引起. + */ + public static boolean isCausedBy(Throwable t, Class... causeExceptionClasses) { + Throwable cause = t; + + while (cause != null) { + for (Class causeClass : causeExceptionClasses) { + if (causeClass.isInstance(cause)) { + return true; + } + } + cause = cause.getCause(); + } + return false; + } + + /** + * 拼装异常类名与异常信息的信息 + * + * @see ExceptionUtils#getMessage(Throwable) + */ + public static String getMessageWithExceptionName(Throwable t) { + return ExceptionUtils.getMessage(t); + } + + /** + * 重载fillInStackTrace()方法,不生成StackTrace. + * + * 适用于Message经常变更,不能使用静态异常时. + */ + public static class EmptyStackStraceException extends Exception { + + private static final long serialVersionUID = -6270471689928560417L; + + public EmptyStackStraceException(String message) { + super(message); + } + + public EmptyStackStraceException(String message, Throwable cause) { + super(message, cause); + } + + @Override + public Throwable fillInStackTrace() { + return this; + } + + public Throwable setStackTrace(Class throwClazz, String throwMethod) { + Exceptions.setStackTrace(this, throwClazz, throwMethod); + return this; + } + } + + /** + * 重载fillInStackTrace()方法,不生成StackTrace. + * + * 适用于Message经常变更,不能使用静态异常时 + */ + public static class EmptyStackStraceRunTimeException extends RuntimeException { + + private static final long serialVersionUID = 4702426016231026020L; + + public EmptyStackStraceRunTimeException(String message) { + super(message); + } + + public EmptyStackStraceRunTimeException(String message, Throwable cause) { + super(message, cause); + } + + @Override + public Throwable fillInStackTrace() { + return this; + } + + public Throwable setStackTrace(Class throwClazz, String throwMethod) { + Exceptions.setStackTrace(this, throwClazz, throwMethod); + return this; + } + } +} diff --git a/modules/utils/src/main/java/org/springside/modules/utils/Ids.java b/modules/utils/src/main/java/org/springside/modules/utils/base/Ids.java similarity index 76% rename from modules/utils/src/main/java/org/springside/modules/utils/Ids.java rename to modules/utils/src/main/java/org/springside/modules/utils/base/Ids.java index a85de40a..5b46a387 100644 --- a/modules/utils/src/main/java/org/springside/modules/utils/Ids.java +++ b/modules/utils/src/main/java/org/springside/modules/utils/base/Ids.java @@ -1,13 +1,15 @@ /******************************************************************************* - * Copyright (c) 2005, 2014 springside.github.io + * Copyright (c) 2005, 2017 springside.github.io * * Licensed under the Apache License, Version 2.0 (the "License"); *******************************************************************************/ -package org.springside.modules.utils; +package org.springside.modules.utils.base; import java.security.SecureRandom; import java.util.UUID; +import org.springside.modules.utils.text.Encodes; + /** * 封装各种生成唯一性ID算法的工具类. */ @@ -37,11 +39,11 @@ public class Ids { } /** - * 基于Base62编码的SecureRandom随机生成bytes. + * 基于URLSafeBase64编码的SecureRandom随机生成bytes. */ - public static String randomBase62(int length) { + public static String randomBase64(int length) { byte[] randomBytes = new byte[length]; random.nextBytes(randomBytes); - return Encodes.encodeBase62(randomBytes); + return Encodes.encodeUrlSafeBase64(randomBytes); } } diff --git a/modules/utils/src/main/java/org/springside/modules/utils/Numbers.java b/modules/utils/src/main/java/org/springside/modules/utils/base/Numbers.java similarity index 92% rename from modules/utils/src/main/java/org/springside/modules/utils/Numbers.java rename to modules/utils/src/main/java/org/springside/modules/utils/base/Numbers.java index c4ac3f27..2acfd6f9 100644 --- a/modules/utils/src/main/java/org/springside/modules/utils/Numbers.java +++ b/modules/utils/src/main/java/org/springside/modules/utils/base/Numbers.java @@ -1,4 +1,4 @@ -package org.springside.modules.utils; +package org.springside.modules.utils.base; import com.google.common.primitives.Ints; import com.google.common.primitives.Longs; diff --git a/modules/utils/src/main/java/org/springside/modules/utils/Reflections.java b/modules/utils/src/main/java/org/springside/modules/utils/base/Reflections.java similarity index 99% rename from modules/utils/src/main/java/org/springside/modules/utils/Reflections.java rename to modules/utils/src/main/java/org/springside/modules/utils/base/Reflections.java index 06cbfa68..33ccc05a 100644 --- a/modules/utils/src/main/java/org/springside/modules/utils/Reflections.java +++ b/modules/utils/src/main/java/org/springside/modules/utils/base/Reflections.java @@ -3,7 +3,7 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); *******************************************************************************/ -package org.springside.modules.utils; +package org.springside.modules.utils.base; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; diff --git a/modules/utils/src/main/java/org/springside/modules/utils/collection/CollectionExtractor.java b/modules/utils/src/main/java/org/springside/modules/utils/collection/CollectionExtractor.java new file mode 100644 index 00000000..ea3eb70f --- /dev/null +++ b/modules/utils/src/main/java/org/springside/modules/utils/collection/CollectionExtractor.java @@ -0,0 +1,93 @@ +package org.springside.modules.utils.collection; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.commons.beanutils.PropertyUtils; +import org.apache.commons.lang3.StringUtils; +import org.springside.modules.utils.base.Reflections; + +@SuppressWarnings("rawtypes") +public class CollectionExtractor { + + ///////////////// 提取集合内的内容 /////////////////// + + /** + * 提取集合中的对象的两个属性(通过Getter函数), 组合成Map. + * + * @param collection 来源集合. + * @param keyPropertyName 要提取为Map中的Key值的属性名. + * @param valuePropertyName 要提取为Map中的Value值的属性名. + */ + public static Map extractToMap(final Collection collection, final String keyPropertyName, + final String valuePropertyName) { + Map map = new HashMap(collection.size()); + + try { + for (Object obj : collection) { + map.put(PropertyUtils.getProperty(obj, keyPropertyName), + PropertyUtils.getProperty(obj, valuePropertyName)); + } + } catch (Exception e) { + throw Reflections.convertReflectionExceptionToUnchecked(e); + } + + return map; + } + + /** + * 提取集合中的对象的一个属性(通过Getter函数), 组合成List. + * + * @param collection 来源集合. + * @param propertyName 要提取的属性名. + */ + public static List extractToList(final Collection collection, final String propertyName) { + List list = new ArrayList(collection.size()); + + try { + for (Object obj : collection) { + list.add(PropertyUtils.getProperty(obj, propertyName)); + } + } catch (Exception e) { + throw Reflections.convertReflectionExceptionToUnchecked(e); + } + + return list; + } + + /** + * 提取集合中的对象的一个属性(通过Getter函数), 组合成由分割符分隔的字符串. + * + * @param collection 来源集合. + * @param propertyName 要提取的属性名. + * @param separator 分隔符. + */ + public static String extractToString(final Collection collection, final String propertyName, + final String separator) { + List list = extractToList(collection, propertyName); + return StringUtils.join(list, separator); + } + + /** + * 转换Collection所有元素(通过toString())为String, 中间以 separator分隔。 + */ + + public static String convertToString(final Collection collection, final String separator) { + return StringUtils.join(collection, separator); + } + + /** + * 转换Collection所有元素(通过toString())为String, 每个元素的前面加入prefix,后面加入postfix,如
mymessage
。 + */ + public static String convertToString(final Collection collection, final String prefix, final String postfix) { + StringBuilder builder = new StringBuilder(); + for (Object o : collection) { + builder.append(prefix).append(o).append(postfix); + } + return builder.toString(); + } + +} diff --git a/modules/utils/src/main/java/org/springside/modules/utils/collection/Collections.java b/modules/utils/src/main/java/org/springside/modules/utils/collection/Collections.java new file mode 100644 index 00000000..4b0cb92a --- /dev/null +++ b/modules/utils/src/main/java/org/springside/modules/utils/collection/Collections.java @@ -0,0 +1,107 @@ +/******************************************************************************* + * Copyright (c) 2005, 2014 springside.github.io + * + * Licensed under the Apache License, Version 2.0 (the "License"); + *******************************************************************************/ +package org.springside.modules.utils.collection; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; + +/** + * Collections工具集. + * + * 其中Apache Common Collections的函数直接封装,避免引入APC. + */ +@SuppressWarnings("rawtypes") +public class Collections { + + /** + * 判断是否为空. + */ + public static boolean isEmpty(Collection collection) { + return (collection == null) || collection.isEmpty(); + } + + /** + * 判断是否不为空. + */ + public static boolean isNotEmpty(Collection collection) { + return (collection != null) && !(collection.isEmpty()); + } + + ///////////////// from Apache Common Collection /////////////////// + /** + * 取得Collection的第一个元素,如果collection为空返回null. + */ + public static T getFirst(Collection collection) { + if (isEmpty(collection)) { + return null; + } + if (collection instanceof List) { + return ((List) collection).get(0); + } + return collection.iterator().next(); + } + + /** + * 获取Collection的最后一个元素,如果collection为空返回null. + */ + public static T getLast(Collection collection) { + if (isEmpty(collection)) { + return null; + } + + // 当类型List时,直接取得最后一个元素. + if (collection instanceof List) { + List list = (List) collection; + return list.get(list.size() - 1); + } + + // 其他类型通过iterator滚动到最后一个元素. + Iterator iterator = collection.iterator(); + while (true) { + T current = iterator.next(); + if (!iterator.hasNext()) { + return current; + } + } + } + + /** + * 返回a+b的新List. + */ + public static List union(final Collection a, final Collection b) { + List result = new ArrayList(a); + result.addAll(b); + return result; + } + + /** + * 返回a-b的新List. + */ + public static List subtract(final Collection a, final Collection b) { + List list = new ArrayList(a); + for (T element : b) { + list.remove(element); + } + + return list; + } + + /** + * 返回a与b的交集的新List. + */ + public static List intersection(Collection a, Collection b) { + List list = new ArrayList(); + + for (T element : a) { + if (b.contains(element)) { + list.add(element); + } + } + return list; + } +} diff --git a/modules/utils/src/main/java/org/springside/modules/utils/collection/Collections3.java b/modules/utils/src/main/java/org/springside/modules/utils/collection/Collections3.java deleted file mode 100644 index f597bc3e..00000000 --- a/modules/utils/src/main/java/org/springside/modules/utils/collection/Collections3.java +++ /dev/null @@ -1,241 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2014 springside.github.io - * - * Licensed under the Apache License, Version 2.0 (the "License"); - *******************************************************************************/ -package org.springside.modules.utils.collection; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.lang3.StringUtils; -import org.springside.modules.utils.Reflections; - -import com.google.common.primitives.Doubles; -import com.google.common.primitives.Ints; -import com.google.common.primitives.Longs; - -/** - * Collections工具集. - * - * 主要由几部分组成: - * - * 1. 是否Empty的最常用函数. - * - * 2. 支持转换原始类型数组为的原始类型数组的List,节约存储空间, 基于Guava. - * - * 3. 源自Apache Commons Collection, 争取不用在项目里引入它. - * - * 4. 反射提取集合种元素及其属性的功能. - * - * 在JDK的Collections和Guava的Collections2/Iterables后, 命名为Collections3. - * - * 另请直接使用: - * - * 1. JDK Collections的singletonList()/singletonMap()/emptyList()/emptyMap() - * - * 2. Guava Lists/Maps的newArrayLists(Element...elements)等函数 - * - * @author calvin - */ -@SuppressWarnings("rawtypes") -public class Collections3 { - - /** - * 判断是否为空. - */ - public static boolean isEmpty(Collection collection) { - return (collection == null) || collection.isEmpty(); - } - - /** - * 判断是否为空. - */ - public static boolean isEmpty(Map map) { - return (map == null) || map.isEmpty(); - } - - /** - * 判断是否不为空. - */ - public static boolean isNotEmpty(Collection collection) { - return (collection != null) && !(collection.isEmpty()); - } - - /** - * 判断是否不为空. - */ - public static boolean isNotEmpty(Map map) { - return (map != null) && !(map.isEmpty()); - } - - /** - * 取得Collection的第一个元素,如果collection为空返回null. - */ - public static T getFirst(Collection collection) { - if (isEmpty(collection)) { - return null; - } - - return collection.iterator().next(); - } - - /** - * 获取Collection的最后一个元素,如果collection为空返回null. - */ - public static T getLast(Collection collection) { - if (isEmpty(collection)) { - return null; - } - - // 当类型List时,直接取得最后一个元素. - if (collection instanceof List) { - List list = (List) collection; - return list.get(list.size() - 1); - } - - // 其他类型通过iterator滚动到最后一个元素. - Iterator iterator = collection.iterator(); - while (true) { - T current = iterator.next(); - if (!iterator.hasNext()) { - return current; - } - } - } - - /** - * 返回a+b的新List. - */ - public static List union(final Collection a, final Collection b) { - List result = new ArrayList(a); - result.addAll(b); - return result; - } - - /** - * 返回a-b的新List. - */ - public static List subtract(final Collection a, final Collection b) { - List list = new ArrayList(a); - for (T element : b) { - list.remove(element); - } - - return list; - } - - /** - * 返回a与b的交集的新List. - */ - public static List intersection(Collection a, Collection b) { - List list = new ArrayList(); - - for (T element : a) { - if (b.contains(element)) { - list.add(element); - } - } - return list; - } - - /** - * 返回一个底层由原始类型long保存的List, 与保存Long相比节约空间. - */ - public static List asList(long... backingArray) { - return Longs.asList(backingArray); - } - - /** - * 返回一个底层由原始类型int保存的List, 与保存Integer相比节约空间. - */ - public static List asList(int... backingArray) { - return Ints.asList(backingArray); - } - - /** - * 返回一个底层由原始类型double保存的Double, 与保存Double相比节约空间. - */ - public static List asList(double... backingArray) { - return Doubles.asList(backingArray); - } - - /** - * 提取集合中的对象的两个属性(通过Getter函数), 组合成Map. - * - * @param collection 来源集合. - * @param keyPropertyName 要提取为Map中的Key值的属性名. - * @param valuePropertyName 要提取为Map中的Value值的属性名. - */ - public static Map extractToMap(final Collection collection, final String keyPropertyName, - final String valuePropertyName) { - Map map = new HashMap(collection.size()); - - try { - for (Object obj : collection) { - map.put(PropertyUtils.getProperty(obj, keyPropertyName), - PropertyUtils.getProperty(obj, valuePropertyName)); - } - } catch (Exception e) { - throw Reflections.convertReflectionExceptionToUnchecked(e); - } - - return map; - } - - /** - * 提取集合中的对象的一个属性(通过Getter函数), 组合成List. - * - * @param collection 来源集合. - * @param propertyName 要提取的属性名. - */ - public static List extractToList(final Collection collection, final String propertyName) { - List list = new ArrayList(collection.size()); - - try { - for (Object obj : collection) { - list.add(PropertyUtils.getProperty(obj, propertyName)); - } - } catch (Exception e) { - throw Reflections.convertReflectionExceptionToUnchecked(e); - } - - return list; - } - - /** - * 提取集合中的对象的一个属性(通过Getter函数), 组合成由分割符分隔的字符串. - * - * @param collection 来源集合. - * @param propertyName 要提取的属性名. - * @param separator 分隔符. - */ - public static String extractToString(final Collection collection, final String propertyName, - final String separator) { - List list = extractToList(collection, propertyName); - return StringUtils.join(list, separator); - } - - /** - * 转换Collection所有元素(通过toString())为String, 中间以 separator分隔。 - */ - public static String convertToString(final Collection collection, final String separator) { - return StringUtils.join(collection, separator); - } - - /** - * 转换Collection所有元素(通过toString())为String, 每个元素的前面加入prefix,后面加入postfix,如
mymessage
。 - */ - public static String convertToString(final Collection collection, final String prefix, final String postfix) { - StringBuilder builder = new StringBuilder(); - for (Object o : collection) { - builder.append(prefix).append(o).append(postfix); - } - return builder.toString(); - } -} diff --git a/modules/utils/src/main/java/org/springside/modules/utils/collection/Lists.java b/modules/utils/src/main/java/org/springside/modules/utils/collection/Lists.java new file mode 100644 index 00000000..2a582948 --- /dev/null +++ b/modules/utils/src/main/java/org/springside/modules/utils/collection/Lists.java @@ -0,0 +1,187 @@ +package org.springside.modules.utils.collection; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.Random; + +import com.google.common.primitives.Doubles; +import com.google.common.primitives.Ints; +import com.google.common.primitives.Longs; + +@SuppressWarnings("unchecked") +public class Lists { + + /** + * 判断是否为空. + */ + @SuppressWarnings("rawtypes") + public static boolean isEmpty(List list) { + return (list == null) || list.isEmpty(); + } + + /** + * 判断是否不为空. + */ + @SuppressWarnings("rawtypes") + public static boolean isNotEmpty(List list) { + return (list != null) && !(list.isEmpty()); + } + + ///////////////// from Guava /////////////////// + /** + * 根据等号左边的类型,构造类型转换的ArrayList. + * + * @see com.google.common.collect.Lists#newArrayList() + */ + public static ArrayList newArrayList() { + return new ArrayList(); + } + + /** + * 根据等号左边的类型,构造类型转换的ArrayList, 并初始化元素. + * + * @see com.google.common.collect.Lists#newArrayList(Object...) + */ + public static ArrayList newArrayList(T... elements) { + return com.google.common.collect.Lists.newArrayList(elements); + } + + /** + * 根据等号左边的类型,构造类型转换的ArrayList, 并初始化数组大小. + * + * @see com.google.common.collect.Lists#newArrayListWithCapacity(int) + */ + public static ArrayList newArrayListWithCapacity(int initialArraySize) { + return new ArrayList(initialArraySize); + } + + /** + * Arrays.asList()的加强版, 返回一个底层由原始类型int保存的List, 与保存Integer相比节约空间. + * + * @see java.util.Arrays#asList(Object...) + * @see com.google.common.primitives.Ints#asList(int...) + * + */ + public static List asList(int... backingArray) { + return Ints.asList(backingArray); + } + + /** + * Arrays.asList()的加强版, 返回一个底层由原始类型long保存的List, 与保存Long相比节约空间. + * + * @see java.util.Arrays#asList(Object...) + * @see com.google.common.primitives.Longs#asList(long...) + */ + public static List asList(long... backingArray) { + return Longs.asList(backingArray); + } + + /** + * Arrays.asList()的加强版, 返回一个底层由原始类型double保存的Double, 与保存Double相比节约空间. + * + * @see java.util.Arrays#asList(Object...) + * @see com.google.common.primitives.Doubles#asList(double...) + */ + public static List asList(double... backingArray) { + return Doubles.asList(backingArray); + } + + ///////////////// from JDK Collecgtions /////////////////// + + /** + * 返回一个空的结构特别的数组,节约空间. 注意数组不可写. + * + * @see java.util.Collections#emptyList() + */ + public static final List emptyList() { + return (List) Collections.EMPTY_LIST; + } + + /** + * 返回一个只含一个元素但结构特别的数组,节约空间. 注意数组不可写. + * + * @see java.util.Collections#singleton(Object) + */ + public static List singletonList(T o) { + return Collections.singletonList(o); + } + + /** + * 排序, 采用JDK认为最优的排序算法. + * + * @see java.util.Collections#sort(List) + */ + public static > void sort(List list) { + list.sort(null); + } + + /** + * 排序, 采用JDK认为最优的排序算法. + * + * @see java.util.Collections#sort(List, Comparator) + */ + public static void sort(List list, Comparator c) { + list.sort(c); + } + + /** + * 二分查找. + * + * @see java.util.Collections#binarySearch(List, Object) + */ + public static int binarySearch(List> list, T key) { + return Collections.binarySearch(list, key); + } + + /** + * 二分查找. + * + * @see java.util.Collections#binarySearch(List, Object, Comparator) + */ + public static int binarySearch(List list, T key, Comparator c) { + return Collections.binarySearch(list, key, c); + } + + /** + * 随机乱序,使用默认的Random. + * + * @see java.util.Collections#shuffle(List) + */ + public static void shuffle(List list) { + Collections.shuffle(list); + } + + /** + * 随机乱序,使用传入的Random. + * + * @see java.util.Collections#shuffle(List, Random) + */ + public static void shuffle(List list, Random rnd) { + Collections.shuffle(list, rnd); + } + + ///////////////// from Apache Common Collection /////////////////// + + /** + * 获取第一个元素, 如果List为空返回 null. + */ + public static T getFirst(List list) { + if (isEmpty(list)) { + return null; + } + return list.get(0); + } + + /** + * 获取最后一个元素,如果List为空返回null. + */ + public static T getLast(List list) { + if (isEmpty(list)) { + return null; + } + + return list.get(list.size() - 1); + } +} diff --git a/modules/utils/src/main/java/org/springside/modules/utils/collection/Maps.java b/modules/utils/src/main/java/org/springside/modules/utils/collection/Maps.java new file mode 100644 index 00000000..4f3663b3 --- /dev/null +++ b/modules/utils/src/main/java/org/springside/modules/utils/collection/Maps.java @@ -0,0 +1,23 @@ +package org.springside.modules.utils.collection; + +import java.util.Map; + +public class Maps { + + /** + * 判断是否为空. + */ + @SuppressWarnings("rawtypes") + public static boolean isEmpty(Map map) { + return (map == null) || map.isEmpty(); + } + + /** + * 判断是否为空. + */ + @SuppressWarnings("rawtypes") + public static boolean isNotEmpty(Map map) { + return (map != null) && !map.isEmpty(); + } + +} diff --git a/modules/utils/src/main/java/org/springside/modules/utils/thread/ThreadDumper.java b/modules/utils/src/main/java/org/springside/modules/utils/concurrent/ThreadDumper.java similarity index 98% rename from modules/utils/src/main/java/org/springside/modules/utils/thread/ThreadDumper.java rename to modules/utils/src/main/java/org/springside/modules/utils/concurrent/ThreadDumper.java index b5fa596f..41d2e90c 100644 --- a/modules/utils/src/main/java/org/springside/modules/utils/thread/ThreadDumper.java +++ b/modules/utils/src/main/java/org/springside/modules/utils/concurrent/ThreadDumper.java @@ -1,4 +1,4 @@ -package org.springside.modules.utils.thread; +package org.springside.modules.utils.concurrent; import java.lang.management.ManagementFactory; import java.lang.management.ThreadInfo; diff --git a/modules/utils/src/main/java/org/springside/modules/utils/thread/ThreadLocalContext.java b/modules/utils/src/main/java/org/springside/modules/utils/concurrent/ThreadLocalContext.java similarity index 94% rename from modules/utils/src/main/java/org/springside/modules/utils/thread/ThreadLocalContext.java rename to modules/utils/src/main/java/org/springside/modules/utils/concurrent/ThreadLocalContext.java index 96bb150a..f916448c 100644 --- a/modules/utils/src/main/java/org/springside/modules/utils/thread/ThreadLocalContext.java +++ b/modules/utils/src/main/java/org/springside/modules/utils/concurrent/ThreadLocalContext.java @@ -1,4 +1,4 @@ -package org.springside.modules.utils.thread; +package org.springside.modules.utils.concurrent; import java.util.HashMap; import java.util.Map; diff --git a/modules/utils/src/main/java/org/springside/modules/utils/thread/ThreadPoolBuilder.java b/modules/utils/src/main/java/org/springside/modules/utils/concurrent/ThreadPoolBuilder.java similarity index 97% rename from modules/utils/src/main/java/org/springside/modules/utils/thread/ThreadPoolBuilder.java rename to modules/utils/src/main/java/org/springside/modules/utils/concurrent/ThreadPoolBuilder.java index d3a0f8c1..8ba3c363 100644 --- a/modules/utils/src/main/java/org/springside/modules/utils/thread/ThreadPoolBuilder.java +++ b/modules/utils/src/main/java/org/springside/modules/utils/concurrent/ThreadPoolBuilder.java @@ -1,4 +1,4 @@ -package org.springside.modules.utils.thread; +package org.springside.modules.utils.concurrent; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; @@ -197,9 +197,9 @@ public class ThreadPoolBuilder { private static ThreadFactory createThreadFactory(String threadNamePrefix, Boolean daemon) { if (threadNamePrefix != null) { if (daemon != null) { - return Threads.buildThreadFactory(threadNamePrefix + "-%d", daemon); + return Threads.buildThreadFactory(threadNamePrefix , daemon); } else { - return Threads.buildThreadFactory(threadNamePrefix + "-%d"); + return Threads.buildThreadFactory(threadNamePrefix); } } return Executors.defaultThreadFactory(); diff --git a/modules/utils/src/main/java/org/springside/modules/utils/thread/Threads.java b/modules/utils/src/main/java/org/springside/modules/utils/concurrent/Threads.java similarity index 96% rename from modules/utils/src/main/java/org/springside/modules/utils/thread/Threads.java rename to modules/utils/src/main/java/org/springside/modules/utils/concurrent/Threads.java index 1eba0933..8adf19fb 100644 --- a/modules/utils/src/main/java/org/springside/modules/utils/thread/Threads.java +++ b/modules/utils/src/main/java/org/springside/modules/utils/concurrent/Threads.java @@ -3,7 +3,7 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); *******************************************************************************/ -package org.springside.modules.utils.thread; +package org.springside.modules.utils.concurrent; import java.util.concurrent.ExecutorService; import java.util.concurrent.ThreadFactory; @@ -86,6 +86,7 @@ public class Threads { /** * 保证不会有Exception抛出到线程池的Runnable包裹类,防止用户没有捕捉异常导致中断了线程池中的线程, 使得SchedulerService无法执行. + * 在无法控制第三方包的Runnalbe实现时,使用本类进行包裹. */ public static class WrapExceptionRunnable implements Runnable { diff --git a/modules/utils/src/main/java/org/springside/modules/utils/Encodes.java b/modules/utils/src/main/java/org/springside/modules/utils/text/Encodes.java similarity index 60% rename from modules/utils/src/main/java/org/springside/modules/utils/Encodes.java rename to modules/utils/src/main/java/org/springside/modules/utils/text/Encodes.java index 2996f332..8731399b 100644 --- a/modules/utils/src/main/java/org/springside/modules/utils/Encodes.java +++ b/modules/utils/src/main/java/org/springside/modules/utils/text/Encodes.java @@ -3,7 +3,7 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); *******************************************************************************/ -package org.springside.modules.utils; +package org.springside.modules.utils.text; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -13,19 +13,20 @@ import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Hex; import org.apache.commons.lang3.StringEscapeUtils; +import org.springside.modules.utils.base.Exceptions; /** * 封装各种格式的编码解码工具类. * - * 1.Commons-Codec的 hex/base64 编码 - * 2.自制的base62 编码 - * 3.Commons-Lang的xml/html escape - * 4.JDK提供的URLEncoder + * 1.Commons-Codec的 hex/base64 编解码 + * + * 2.Commons-Lang的json/xml/html 编解码 + * + * 3.JDK提供的URL 编解码 */ public class Encodes { private static final String DEFAULT_URL_ENCODING = "UTF-8"; - private static final char[] BASE62 = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz".toCharArray(); /** * Hex编码. @@ -67,42 +68,48 @@ public class Encodes { } /** - * Base62编码。 + * Json转码,将字符串转码为符合JSON格式的字符串. + * + * 比如 "Stop!" 转化为\"Stop!\" */ - public static String encodeBase62(byte[] input) { - char[] chars = new char[input.length]; - for (int i = 0; i < input.length; i++) { - chars[i] = BASE62[(input[i] & 0xFF) % BASE62.length]; - } - return new String(chars); + public static String escapeJson(String json) { + return StringEscapeUtils.escapeJson(json); } /** - * Html 转码. + * Xml转码,将字符串转码为符合XML1.1格式的字符串. + * + * 比如 "bread" & "butter" 转化为 "bread" & "butter" + */ + public static String escapeXml(String xml) { + return StringEscapeUtils.escapeXml11(xml); + } + + /** + * Xml转码,XML格式的字符串解码为普通字符串. + * + * 比如 "bread" & "butter" 转化为"bread" & "butter" + */ + public static String unescapeXml(String xml) { + return StringEscapeUtils.unescapeXml(xml); + } + + /** + * Html转码,将字符串转码为符合HTML4格式的字符串. + * + * 比如 "bread" & "butter" 转化为 "bread" & "butter" */ public static String escapeHtml(String html) { return StringEscapeUtils.escapeHtml4(html); } /** - * Html 解码. + * Html解码,将HTML4格式的字符串转码解码为普通字符串. + * + * 比如 "bread" & "butter"转化为"bread" & "butter" */ - public static String unescapeHtml(String htmlEscaped) { - return StringEscapeUtils.unescapeHtml4(htmlEscaped); - } - - /** - * Xml 转码. - */ - public static String escapeXml(String xml) { - return StringEscapeUtils.escapeXml(xml); - } - - /** - * Xml 解码. - */ - public static String unescapeXml(String xmlEscaped) { - return StringEscapeUtils.unescapeXml(xmlEscaped); + public static String unescapeHtml(String html) { + return StringEscapeUtils.unescapeHtml4(html); } /** @@ -111,8 +118,8 @@ public class Encodes { public static String urlEncode(String part) { try { return URLEncoder.encode(part, DEFAULT_URL_ENCODING); - } catch (UnsupportedEncodingException e) { - throw Exceptions.unchecked(e); + } catch (UnsupportedEncodingException ignored) { + return null; } } @@ -120,11 +127,10 @@ public class Encodes { * URL 解码, Encode默认为UTF-8. */ public static String urlDecode(String part) { - try { return URLDecoder.decode(part, DEFAULT_URL_ENCODING); } catch (UnsupportedEncodingException e) { - throw Exceptions.unchecked(e); + return null; } } } diff --git a/modules/utils/src/main/java/org/springside/modules/utils/text/Hashs.java b/modules/utils/src/main/java/org/springside/modules/utils/text/Hashs.java new file mode 100644 index 00000000..9a5009fa --- /dev/null +++ b/modules/utils/src/main/java/org/springside/modules/utils/text/Hashs.java @@ -0,0 +1,272 @@ +/******************************************************************************* + * Copyright (c) 2005, 2014 springside.github.io + * + * Licensed under the Apache License, Version 2.0 (the "License"); + *******************************************************************************/ +package org.springside.modules.utils.text; + +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.Charset; +import java.security.GeneralSecurityException; +import java.security.MessageDigest; +import java.security.SecureRandom; +import java.util.Arrays; +import java.util.zip.CRC32; + +import org.apache.commons.lang3.Validate; +import org.springside.modules.constants.Charsets; +import org.springside.modules.utils.base.Exceptions; + +import com.google.common.hash.Hashing; + +/** + * 封装各种Hash算法的工具类. + * + * 1.SHA-1/MD5这些安全性较高,返回byte[](可用Encodes进一步被编码为Hex, Base64), 支持带salt达到更高的安全性. + * + * 2.crc32,murmur32这些不追求安全性,性能较高,返回int. + * + * @author calvin + */ +public class Hashs { + + private static final String SHA1 = "SHA-1"; + private static final String MD5 = "MD5"; + + private static SecureRandom random = new SecureRandom(); + + /** + * 多个对象的Hash值串连 + */ + public static int hashCode(Object... objects) { + return Arrays.hashCode(objects); + } + + /** + * 对输入字符串进行sha1散列. + */ + public static byte[] sha1(byte[] input) { + return digest(input, SHA1, null, 1); + } + + /** + * 对输入字符串进行sha1散列. + */ + public static byte[] sha1(String input) { + return digest(input.getBytes(Charsets.UTF8), SHA1, null, 1); + } + + /** + * 对输入字符串进行sha1散列. + */ + public static byte[] sha1(String input, Charset charset) { + return digest(input.getBytes(charset), SHA1, null, 1); + } + + /** + * 对输入字符串进行sha1散列,带salt达到更高的安全性. + */ + public static byte[] sha1(byte[] input, byte[] salt) { + return digest(input, SHA1, salt, 1); + } + + /** + * 对输入字符串进行sha1散列,带salt达到更高的安全性. + */ + public static byte[] sha1(String input, byte[] salt) { + return digest(input.getBytes(Charsets.UTF8), SHA1, salt, 1); + } + + /** + * 对输入字符串进行sha1散列,带salt达到更高的安全性. + */ + public static byte[] sha1(String input, Charset charset, byte[] salt) { + return digest(input.getBytes(charset), SHA1, salt, 1); + } + + /** + * 对输入字符串进行sha1散列,带salt而且迭代达到更高更高的安全性. + */ + public static byte[] sha1(byte[] input, byte[] salt, int iterations) { + return digest(input, SHA1, salt, iterations); + } + + /** + * 对输入字符串进行sha1散列,带salt而且迭代达到更高更高的安全性. + */ + public static byte[] sha1(String input, byte[] salt, int iterations) { + return digest(input.getBytes(Charsets.UTF8), SHA1, salt, iterations); + } + + /** + * 对输入字符串进行sha1散列,带salt而且迭代达到更高更高的安全性. + */ + public static byte[] sha1(String input, Charset charset, byte[] salt, int iterations) { + return digest(input.getBytes(charset), SHA1, salt, iterations); + } + + /** + * 对字符串进行散列, 支持md5与sha1算法. + */ + private static byte[] digest(byte[] input, String algorithm, byte[] salt, int iterations) { + try { + MessageDigest digest = MessageDigest.getInstance(algorithm); + + if (salt != null) { + digest.update(salt); + } + + byte[] result = digest.digest(input); + + for (int i = 1; i < iterations; i++) { + digest.reset(); + result = digest.digest(result); + } + return result; + } catch (GeneralSecurityException e) { + throw Exceptions.unchecked(e); + } + } + + /** + * 生成随机的Byte[]作为salt. + * + * @param numBytes salt数组的大小 + */ + public static byte[] generateSalt(int numBytes) { + Validate.isTrue(numBytes > 0, "numBytes argument must be a positive integer (1 or larger)", numBytes); + + byte[] bytes = new byte[numBytes]; + random.nextBytes(bytes); + return bytes; + } + + /** + * 对文件进行md5散列. + */ + public static byte[] md5(InputStream input) throws IOException { + return digest(input, MD5); + } + + /** + * 对文件进行sha1散列. + */ + public static byte[] sha1(InputStream input) throws IOException { + return digest(input, SHA1); + } + + private static byte[] digest(InputStream input, String algorithm) throws IOException { + try { + MessageDigest messageDigest = MessageDigest.getInstance(algorithm); + int bufferLength = 8 * 1024; + byte[] buffer = new byte[bufferLength]; + int read = input.read(buffer, 0, bufferLength); + + while (read > -1) { + messageDigest.update(buffer, 0, read); + read = input.read(buffer, 0, bufferLength); + } + + return messageDigest.digest(); + } catch (GeneralSecurityException e) { + throw Exceptions.unchecked(e); + } + } + + /** + * 对输入字符串进行crc32散列. + */ + public static int crc32(byte[] input) { + CRC32 crc32 = new CRC32(); + crc32.update(input); + return (int) crc32.getValue(); + } + + /** + * 对输入字符串进行crc32散列. + */ + public static int crc32(String input) { + CRC32 crc32 = new CRC32(); + crc32.update(input.getBytes(Charsets.UTF8)); + return (int) crc32.getValue(); + } + + /** + * 对输入字符串进行crc32散列. + */ + public static int crc32(String input, Charset charset) { + CRC32 crc32 = new CRC32(); + crc32.update(input.getBytes(charset)); + return (int) crc32.getValue(); + } + + /** + * 对输入字符串进行crc32散列,与php兼容,在64bit系统下返回永远是正数的long + */ + public static long crc32AsLong(byte[] input) { + CRC32 crc32 = new CRC32(); + crc32.update(input); + return crc32.getValue(); + } + + /** + * 对输入字符串进行crc32散列,与php兼容,在64bit系统下返回永远是正数的long + */ + public static long crc32AsLong(String input) { + CRC32 crc32 = new CRC32(); + crc32.update(input.getBytes(Charsets.UTF8)); + return crc32.getValue(); + } + + /** + * 对输入字符串进行crc32散列,与php兼容,在64bit系统下返回永远是正数的long + */ + public static long crc32AsLong(String input, Charset charset) { + CRC32 crc32 = new CRC32(); + crc32.update(input.getBytes(charset)); + return crc32.getValue(); + } + + /** + * 对输入字符串进行murmur32散列 + */ + public static int murmur32(byte[] input) { + return Hashing.murmur3_32().hashBytes(input).asInt(); + } + + /** + * 对输入字符串进行murmur32散列 + */ + public static int murmur32(String input) { + return Hashing.murmur3_32().hashString(input, Charsets.UTF8).asInt(); + } + + /** + * 对输入字符串进行murmur32散列 + */ + public static int murmur32(String input, Charset charset) { + return Hashing.murmur3_32().hashString(input, charset).asInt(); + } + + /** + * 对输入字符串进行murmur32散列,带有seed + */ + public static int murmur32(byte[] input, int seed) { + return Hashing.murmur3_32(seed).hashBytes(input).asInt(); + } + + /** + * 对输入字符串进行murmur32散列,带有seed + */ + public static int murmur32(String input, int seed) { + return Hashing.murmur3_32(seed).hashString(input, Charsets.UTF8).asInt(); + } + + /** + * 对输入字符串进行murmur32散列,带有seed + */ + public static int murmur32(String input, Charset charset, int seed) { + return Hashing.murmur3_32(seed).hashString(input, charset).asInt(); + } +} diff --git a/modules/utils/src/main/java/org/springside/modules/utils/StringBuilderHolder.java b/modules/utils/src/main/java/org/springside/modules/utils/text/StringBuilderHolder.java similarity index 95% rename from modules/utils/src/main/java/org/springside/modules/utils/StringBuilderHolder.java rename to modules/utils/src/main/java/org/springside/modules/utils/text/StringBuilderHolder.java index 9bcdde4a..82f3ae55 100644 --- a/modules/utils/src/main/java/org/springside/modules/utils/StringBuilderHolder.java +++ b/modules/utils/src/main/java/org/springside/modules/utils/text/StringBuilderHolder.java @@ -1,4 +1,4 @@ -package org.springside.modules.utils; +package org.springside.modules.utils.text; /** * 参考BigDecimal, 可重用的StringBuilder, 节约StringBuilder内部的char[] diff --git a/modules/utils/src/main/java/org/springside/modules/utils/Clock.java b/modules/utils/src/main/java/org/springside/modules/utils/time/Clock.java similarity index 97% rename from modules/utils/src/main/java/org/springside/modules/utils/Clock.java rename to modules/utils/src/main/java/org/springside/modules/utils/time/Clock.java index 80e6e2b0..e2567807 100644 --- a/modules/utils/src/main/java/org/springside/modules/utils/Clock.java +++ b/modules/utils/src/main/java/org/springside/modules/utils/time/Clock.java @@ -3,7 +3,7 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); *******************************************************************************/ -package org.springside.modules.utils; +package org.springside.modules.utils.time; import java.util.Date; diff --git a/modules/utils/src/test/java/org/springside/modules/utils/ExceptionsTest.java b/modules/utils/src/test/java/org/springside/modules/utils/base/ExceptionsTest.java similarity index 91% rename from modules/utils/src/test/java/org/springside/modules/utils/ExceptionsTest.java rename to modules/utils/src/test/java/org/springside/modules/utils/base/ExceptionsTest.java index b02acb52..e41fb7eb 100644 --- a/modules/utils/src/test/java/org/springside/modules/utils/ExceptionsTest.java +++ b/modules/utils/src/test/java/org/springside/modules/utils/base/ExceptionsTest.java @@ -3,13 +3,14 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); *******************************************************************************/ -package org.springside.modules.utils; +package org.springside.modules.utils.base; import static org.assertj.core.api.Assertions.*; import java.io.IOException; import org.junit.Test; +import org.springside.modules.utils.base.Exceptions; public class ExceptionsTest { @@ -30,7 +31,7 @@ public class ExceptionsTest { Exception exception = new Exception("my exception"); RuntimeException runtimeException = new RuntimeException(exception); - String stack = Exceptions.getStackTraceAsString(runtimeException); + String stack = Exceptions.stackTraceText(runtimeException); System.out.println(stack); } diff --git a/modules/utils/src/test/java/org/springside/modules/utils/IdsTest.java b/modules/utils/src/test/java/org/springside/modules/utils/base/IdsTest.java similarity index 77% rename from modules/utils/src/test/java/org/springside/modules/utils/IdsTest.java rename to modules/utils/src/test/java/org/springside/modules/utils/base/IdsTest.java index 1f7b59bd..0e7f9c34 100644 --- a/modules/utils/src/test/java/org/springside/modules/utils/IdsTest.java +++ b/modules/utils/src/test/java/org/springside/modules/utils/base/IdsTest.java @@ -3,9 +3,10 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); *******************************************************************************/ -package org.springside.modules.utils; +package org.springside.modules.utils.base; import org.junit.Test; +import org.springside.modules.utils.base.Ids; public class IdsTest { @@ -14,6 +15,6 @@ public class IdsTest { System.out.println("uuid: " + Ids.uuid()); System.out.println("uuid2:" + Ids.uuid2()); System.out.println("randomLong: " + Ids.randomLong()); - System.out.println("randomBase62:" + Ids.randomBase62(7)); + System.out.println("randomBase64:" + Ids.randomBase64(7)); } } diff --git a/modules/utils/src/test/java/org/springside/modules/utils/ReflectionsTest.java b/modules/utils/src/test/java/org/springside/modules/utils/base/ReflectionsTest.java similarity index 98% rename from modules/utils/src/test/java/org/springside/modules/utils/ReflectionsTest.java rename to modules/utils/src/test/java/org/springside/modules/utils/base/ReflectionsTest.java index 790d03b9..2aafe39a 100644 --- a/modules/utils/src/test/java/org/springside/modules/utils/ReflectionsTest.java +++ b/modules/utils/src/test/java/org/springside/modules/utils/base/ReflectionsTest.java @@ -3,13 +3,14 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); *******************************************************************************/ -package org.springside.modules.utils; +package org.springside.modules.utils.base; import static org.assertj.core.api.Assertions.*; import java.lang.reflect.InvocationTargetException; import org.junit.Test; +import org.springside.modules.utils.base.Reflections; public class ReflectionsTest { diff --git a/modules/utils/src/test/java/org/springside/modules/utils/collection/Collecitons3Test.java b/modules/utils/src/test/java/org/springside/modules/utils/collection/CollectionExtractorTest.java similarity index 77% rename from modules/utils/src/test/java/org/springside/modules/utils/collection/Collecitons3Test.java rename to modules/utils/src/test/java/org/springside/modules/utils/collection/CollectionExtractorTest.java index fbe87c45..973f96bf 100644 --- a/modules/utils/src/test/java/org/springside/modules/utils/collection/Collecitons3Test.java +++ b/modules/utils/src/test/java/org/springside/modules/utils/collection/CollectionExtractorTest.java @@ -10,11 +10,11 @@ import static org.assertj.core.api.Assertions.*; import java.util.List; import org.junit.Test; -import org.springside.modules.utils.collection.Collections3; +import org.springside.modules.utils.collection.Collections; import com.google.common.collect.Lists; -public class Collecitons3Test { +public class CollectionExtractorTest { @Test public void convertElementPropertyToString() { @@ -25,7 +25,7 @@ public class Collecitons3Test { List list = Lists.newArrayList(bean1, bean2); - assertThat(Collections3.extractToString(list, "id", ",")).isEqualTo("1,2"); + assertThat(CollectionExtractor.extractToString(list, "id", ",")).isEqualTo("1,2"); } @Test @@ -36,17 +36,17 @@ public class Collecitons3Test { bean2.setId(2); List list = Lists.newArrayList(bean1, bean2); - List result = Collections3.extractToList(list, "id"); + List result = CollectionExtractor.extractToList(list, "id"); assertThat(result).containsOnly(1, 2); } @Test public void convertCollectionToString() { List list = Lists.newArrayList("aa", "bb"); - String result = Collections3.convertToString(list, ","); + String result = CollectionExtractor.convertToString(list, ","); assertThat(result).isEqualTo("aa,bb"); - result = Collections3.convertToString(list, "
  • ", "
  • "); + result = CollectionExtractor.convertToString(list, "
  • ", "
  • "); assertThat(result).isEqualTo("
  • aa
  • bb
  • "); } diff --git a/modules/utils/src/test/java/org/springside/modules/utils/thread/ThreadsTest.java b/modules/utils/src/test/java/org/springside/modules/utils/concurrent/ThreadsTest.java similarity index 96% rename from modules/utils/src/test/java/org/springside/modules/utils/thread/ThreadsTest.java rename to modules/utils/src/test/java/org/springside/modules/utils/concurrent/ThreadsTest.java index ac0d7877..b21f75b8 100644 --- a/modules/utils/src/test/java/org/springside/modules/utils/thread/ThreadsTest.java +++ b/modules/utils/src/test/java/org/springside/modules/utils/concurrent/ThreadsTest.java @@ -3,7 +3,7 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); *******************************************************************************/ -package org.springside.modules.utils.thread; +package org.springside.modules.utils.concurrent; import static org.assertj.core.api.Assertions.*; @@ -16,7 +16,7 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springside.modules.test.log.LogbackListAppender; -import org.springside.modules.utils.thread.Threads; +import org.springside.modules.utils.concurrent.Threads; public class ThreadsTest { diff --git a/modules/utils/src/test/java/org/springside/modules/utils/EncodesTest.java b/modules/utils/src/test/java/org/springside/modules/utils/text/EncodesTest.java similarity index 94% rename from modules/utils/src/test/java/org/springside/modules/utils/EncodesTest.java rename to modules/utils/src/test/java/org/springside/modules/utils/text/EncodesTest.java index 2ea23cb5..9703cc2e 100644 --- a/modules/utils/src/test/java/org/springside/modules/utils/EncodesTest.java +++ b/modules/utils/src/test/java/org/springside/modules/utils/text/EncodesTest.java @@ -3,11 +3,12 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); *******************************************************************************/ -package org.springside.modules.utils; +package org.springside.modules.utils.text; import static org.assertj.core.api.Assertions.*; import org.junit.Test; +import org.springside.modules.utils.text.Encodes; public class EncodesTest {