From 4d0032fe280891663ea3e3516322357816b0b34d Mon Sep 17 00:00:00 2001 From: calvin1978 Date: Sun, 1 Jan 2017 09:47:07 +0800 Subject: [PATCH] =?UTF-8?q?#525=20=E5=8A=A0=E5=BC=BAUtils=20Modules?= =?UTF-8?q?=E6=A8=A1=E5=9D=97:=20=E6=B7=B1=E5=A4=9C=E7=9A=84=E6=88=98?= =?UTF-8?q?=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../examples/bootapi/service/AccountService.java | 2 +- .../springside/modules/utils/base/Platforms.java | 16 ++++++++-------- .../utils/collection/CollectionExtractor.java | 3 +++ .../utils/{base => misc}/IdGenerator.java | 2 +- .../modules/utils/reflect/ClassLoaders.java | 8 ++++++++ .../modules/utils/reflect/Reflections.java | 3 +++ .../utils/{base => misc}/IdGeneratorTest.java | 3 ++- 7 files changed, 26 insertions(+), 11 deletions(-) rename modules/utils/src/main/java/org/springside/modules/utils/{base => misc}/IdGenerator.java (96%) rename modules/utils/src/test/java/org/springside/modules/utils/{base => misc}/IdGeneratorTest.java (86%) 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 b61176b4..f583abdd 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 @@ -17,7 +17,7 @@ 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.text.Hashs; -import org.springside.modules.utils.base.IdGenerator; +import org.springside.modules.utils.misc.IdGenerator; import org.springside.modules.utils.text.Encodes; import com.google.common.cache.Cache; diff --git a/modules/utils/src/main/java/org/springside/modules/utils/base/Platforms.java b/modules/utils/src/main/java/org/springside/modules/utils/base/Platforms.java index 1959e737..7bd2edbb 100644 --- a/modules/utils/src/main/java/org/springside/modules/utils/base/Platforms.java +++ b/modules/utils/src/main/java/org/springside/modules/utils/base/Platforms.java @@ -7,15 +7,15 @@ import org.apache.commons.lang3.SystemUtils; public class Platforms { // 文件路径分隔符 - public static final String FILE_SEPARATOR = File.separator; - public static final char FILE_SEPARATOR_CHAR = File.separatorChar; - - // 换行符 JDK7可使用System.lineSeparator() - public static final String LINE_SEPARATOR = SystemUtils.LINE_SEPARATOR; - + public static final String FILE_PATH_SEPARATOR = File.separator; + public static final char FILE_PATH_SEPARATOR_CHAR = File.separatorChar; + // ClassPath分隔符 - public static final String PATH_SEPARATOR = File.pathSeparator; - public static final char PATH_SEPARATOR_CHAR = File.pathSeparatorChar; + public static final String CLASS_PATH_SEPARATOR = File.pathSeparator; + public static final char CLASS_PATH_SEPARATOR_CHAR = File.pathSeparatorChar; + + // 换行符, JDK7可使用System.lineSeparator() + public static final String LINE_SEPARATOR = SystemUtils.LINE_SEPARATOR; // 临时目录 public static final String TMP_DIR = SystemUtils.JAVA_IO_TMPDIR; 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 index 65a0c936..6858f9fc 100644 --- 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 @@ -10,10 +10,13 @@ import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.lang3.StringUtils; import org.springside.modules.utils.reflect.Reflections; +import com.google.common.annotations.Beta; + /** * 提取集合内元素的内容，依赖BeanUtils(考虑取消依赖) */ @SuppressWarnings("rawtypes") +@Beta public class CollectionExtractor { /** diff --git a/modules/utils/src/main/java/org/springside/modules/utils/base/IdGenerator.java b/modules/utils/src/main/java/org/springside/modules/utils/misc/IdGenerator.java similarity index 96% rename from modules/utils/src/main/java/org/springside/modules/utils/base/IdGenerator.java rename to modules/utils/src/main/java/org/springside/modules/utils/misc/IdGenerator.java index 0993de28..9879f340 100644 --- a/modules/utils/src/main/java/org/springside/modules/utils/base/IdGenerator.java +++ b/modules/utils/src/main/java/org/springside/modules/utils/misc/IdGenerator.java @@ -3,7 +3,7 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); *******************************************************************************/ -package org.springside.modules.utils.base; +package org.springside.modules.utils.misc; import java.security.SecureRandom; import java.util.UUID; diff --git a/modules/utils/src/main/java/org/springside/modules/utils/reflect/ClassLoaders.java b/modules/utils/src/main/java/org/springside/modules/utils/reflect/ClassLoaders.java index 851d24af..2e1acd34 100644 --- a/modules/utils/src/main/java/org/springside/modules/utils/reflect/ClassLoaders.java +++ b/modules/utils/src/main/java/org/springside/modules/utils/reflect/ClassLoaders.java @@ -1,5 +1,13 @@ package org.springside.modules.utils.reflect; +import com.google.common.annotations.Beta; + +/** + * Class加载相关的工具类 + * + * @author calvin + */ +@Beta public class ClassLoaders { private static final String CLASS_FILE_NAME_EXTENSION = ".class"; diff --git a/modules/utils/src/main/java/org/springside/modules/utils/reflect/Reflections.java b/modules/utils/src/main/java/org/springside/modules/utils/reflect/Reflections.java index ac9fec5f..e6a5f048 100644 --- a/modules/utils/src/main/java/org/springside/modules/utils/reflect/Reflections.java +++ b/modules/utils/src/main/java/org/springside/modules/utils/reflect/Reflections.java @@ -17,11 +17,14 @@ import org.apache.commons.lang3.Validate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.annotations.Beta; + /** * 反射工具类. * * 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数. */ +@Beta public class Reflections { private static final String SETTER_PREFIX = "set"; diff --git a/modules/utils/src/test/java/org/springside/modules/utils/base/IdGeneratorTest.java b/modules/utils/src/test/java/org/springside/modules/utils/misc/IdGeneratorTest.java similarity index 86% rename from modules/utils/src/test/java/org/springside/modules/utils/base/IdGeneratorTest.java rename to modules/utils/src/test/java/org/springside/modules/utils/misc/IdGeneratorTest.java index a6da3868..f6857094 100644 --- a/modules/utils/src/test/java/org/springside/modules/utils/base/IdGeneratorTest.java +++ b/modules/utils/src/test/java/org/springside/modules/utils/misc/IdGeneratorTest.java @@ -3,9 +3,10 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); *******************************************************************************/ -package org.springside.modules.utils.base; +package org.springside.modules.utils.misc; import org.junit.Test; +import org.springside.modules.utils.misc.IdGenerator; public class IdGeneratorTest {