diff --git a/README.md b/README.md index 9a1bced271..760099f5de 100755 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@
-
+
@@ -70,7 +70,7 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架,它基于Jav
|[ √ ]|bus-oauth|第三方登录,已集成十多家第三方平台(国内外常用的基本都已包含)|
|[ √ ]|bus-pager|数据分页,mybatis|
|[ √ ]|bus-office|office等相关转换及处理,POI封装实现,使Java操作Excel等文件变得更加简单|
-|[ √ ]|bus-opencv|图像识别及分析,提供丰富的徒刑图像处理算法,跨平台支持等|
+|[ √ ]|bus-opencv|图像识别及分析,提供丰富的图形图像处理算法,跨平台支持等|
|[ √ ]|bus-proxy|公共代理,使动态代理变得简单|
|[ √ ]|bus-sensitive|敏感数据脱敏,对应用和使用者透明,业务逻辑无感知,通过配置集成,改动代码量小|
|[ √ ]|bus-setting|设置工具类, 用于支持设置/配置|
@@ -98,7 +98,7 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架,它基于Jav
+ * 1. 在字段上有{@link Ignore} 注解 + * 2. 在setXXX方法上有{@link Ignore} 注解 + *+ * + * @return 是否忽略写 + */ + private boolean isIgnoreSet() { + return AnnoKit.hasAnnotation(this.field, Ignore.class) + || AnnoKit.hasAnnotation(this.setter, Ignore.class); + } + + /** + * 检查字段是否被忽略读,通过{@link Ignore} 注解完成,规则为: + *
+ * 1. 在字段上有{@link Ignore} 注解 + * 2. 在getXXX方法上有{@link Ignore} 注解 + *+ * + * @return 是否忽略读 + */ + private boolean isIgnoreGet() { + return AnnoKit.hasAnnotation(this.field, Ignore.class) + || AnnoKit.hasAnnotation(this.getter, Ignore.class); + } + + /** + * 字段和Getter方法是否为Transient关键字修饰的 + * + * @return 是否为Transient关键字修饰的 + */ + private boolean isTransientForGet() { + boolean isTransient = BeanKit.hasModifier(this.field, BeanKit.ModifierType.TRANSIENT); + + // 检查Getter方法 + if (false == isTransient && null != this.getter) { + isTransient = BeanKit.hasModifier(this.getter, BeanKit.ModifierType.TRANSIENT); + + // 检查注解 + if (false == isTransient) { + isTransient = AnnoKit.hasAnnotation(this.getter, Transient.class); + } + } + + return isTransient; + } + + /** + * 字段和Getter方法是否为Transient关键字修饰的 + * + * @return 是否为Transient关键字修饰的 + */ + private boolean isTransientForSet() { + boolean isTransient = BeanKit.hasModifier(this.field, BeanKit.ModifierType.TRANSIENT); + + // 检查Getter方法 + if (false == isTransient && null != this.setter) { + isTransient = BeanKit.hasModifier(this.setter, BeanKit.ModifierType.TRANSIENT); + + // 检查注解 + if (false == isTransient) { + isTransient = AnnoKit.hasAnnotation(this.setter, Transient.class); + } + } + + return isTransient; + } + } } diff --git a/bus-core/src/main/java/org/aoju/bus/core/beans/BeanDescCache.java b/bus-core/src/main/java/org/aoju/bus/core/beans/BeanDescCache.java index 6ff2297c13..cc81ad6cb6 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/beans/BeanDescCache.java +++ b/bus-core/src/main/java/org/aoju/bus/core/beans/BeanDescCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.beans; @@ -32,7 +33,7 @@ * 缓存用于防止多次反射造成的性能问题 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum BeanDescCache { diff --git a/bus-core/src/main/java/org/aoju/bus/core/beans/BeanInfoCache.java b/bus-core/src/main/java/org/aoju/bus/core/beans/BeanInfoCache.java index 88d00b0dc7..a681f51778 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/beans/BeanInfoCache.java +++ b/bus-core/src/main/java/org/aoju/bus/core/beans/BeanInfoCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.beans; @@ -35,7 +36,7 @@ * 缓存用于防止多次反射造成的性能问题 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum BeanInfoCache { diff --git a/bus-core/src/main/java/org/aoju/bus/core/beans/BeanPath.java b/bus-core/src/main/java/org/aoju/bus/core/beans/BeanPath.java index 05ef385283..f1a090377e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/beans/BeanPath.java +++ b/bus-core/src/main/java/org/aoju/bus/core/beans/BeanPath.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.beans; @@ -50,7 +51,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BeanPath implements Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/beans/DynaBean.java b/bus-core/src/main/java/org/aoju/bus/core/beans/DynaBean.java index ac72d245de..cf291300e9 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/beans/DynaBean.java +++ b/bus-core/src/main/java/org/aoju/bus/core/beans/DynaBean.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.beans; @@ -40,7 +41,7 @@ * 支持Map和普通Bean * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DynaBean extends Support
* * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ReflectionToStringBuilder extends ToStringBuilder { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/StandardToStringStyle.java b/bus-core/src/main/java/org/aoju/bus/core/builder/StandardToStringStyle.java index b5638c14ae..06eacf009e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/StandardToStringStyle.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/StandardToStringStyle.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.builder; @@ -33,7 +34,7 @@ *
* * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StandardToStringStyle extends ToStringStyle { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringBuilder.java b/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringBuilder.java index 8723585239..21219dfc38 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringBuilder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.builder; @@ -63,7 +64,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ToStringBuilder implements Builder