From eb4b7324168d0ec4257b74f55646fade1528038d Mon Sep 17 00:00:00 2001 From: wangyu <727842003@qq.com> Date: Tue, 16 Jul 2024 11:45:06 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8A=BD=E7=A6=BB=E5=85=AC=E5=85=B1?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E5=B7=A5=E5=85=B7=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flyfish-bean/pom.xml | 28 +++++++++++++++++++ .../framework/beans/enums/package-info.java | 1 + .../framework/beans/meta/package-info.java | 1 + .../meta/parser/BeanPropertyAnnotations.java | 24 ++++++++++++++++ .../parser/SimpleBeanPropertyAnnotations.java | 18 ++++++------ .../parser/chain/AnnotationChainSupport.java | 0 .../BeanPropertyAnnotationBatchChain.java | 0 .../chain/BeanPropertyAnnotationChain.java | 0 .../impl/BasicAnnotationChainSupport.java | 0 .../chain/impl/EmptyAnnotationBatchChain.java | 5 ++-- .../chain/impl/EmptyAnnotationChain.java | 5 ++-- .../impl/SimpleAnnotationBatchChain.java | 9 +++--- .../chain/impl/SimpleAnnotationChain.java | 7 +++-- .../dev/flyfish/framework/domain/po/User.java | 1 - flyfish-web/pom.xml | 5 ++++ .../beans/enums/ValidationCandidate.java | 2 +- .../framework/beans/meta/BeanProperty.java | 4 +-- .../parser/BeanPropertyAnnotationParser.java | 10 ------- pom.xml | 9 +++++- 19 files changed, 94 insertions(+), 35 deletions(-) create mode 100644 flyfish-bean/pom.xml create mode 100644 flyfish-bean/src/main/java/dev/flyfish/framework/beans/enums/package-info.java create mode 100644 flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/package-info.java rename {flyfish-web => flyfish-bean}/src/main/java/dev/flyfish/framework/beans/meta/parser/BeanPropertyAnnotations.java (81%) rename {flyfish-web => flyfish-bean}/src/main/java/dev/flyfish/framework/beans/meta/parser/SimpleBeanPropertyAnnotations.java (91%) rename {flyfish-web => flyfish-bean}/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/AnnotationChainSupport.java (100%) rename {flyfish-web => flyfish-bean}/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/BeanPropertyAnnotationBatchChain.java (100%) rename {flyfish-web => flyfish-bean}/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/BeanPropertyAnnotationChain.java (100%) rename {flyfish-web => flyfish-bean}/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/BasicAnnotationChainSupport.java (100%) rename {flyfish-web => flyfish-bean}/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationBatchChain.java (95%) rename {flyfish-web => flyfish-bean}/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationChain.java (95%) rename {flyfish-web => flyfish-bean}/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationBatchChain.java (94%) rename {flyfish-web => flyfish-bean}/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationChain.java (95%) delete mode 100644 flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/BeanPropertyAnnotationParser.java diff --git a/flyfish-bean/pom.xml b/flyfish-bean/pom.xml new file mode 100644 index 0000000..87e49bf --- /dev/null +++ b/flyfish-bean/pom.xml @@ -0,0 +1,28 @@ + + + 4.0.0 + + dev.flyfish.framework + flyfish-framework + 2.0.0 + + + flyfish-bean + flyfish-parser + 飞鱼解析器 + + + 17 + 17 + UTF-8 + + + + + org.springframework + spring-core + + + diff --git a/flyfish-bean/src/main/java/dev/flyfish/framework/beans/enums/package-info.java b/flyfish-bean/src/main/java/dev/flyfish/framework/beans/enums/package-info.java new file mode 100644 index 0000000..2d9a53d --- /dev/null +++ b/flyfish-bean/src/main/java/dev/flyfish/framework/beans/enums/package-info.java @@ -0,0 +1 @@ +package dev.flyfish.framework.beans.enums; diff --git a/flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/package-info.java b/flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/package-info.java new file mode 100644 index 0000000..84d864d --- /dev/null +++ b/flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/package-info.java @@ -0,0 +1 @@ +package dev.flyfish.framework.beans.meta; diff --git a/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/BeanPropertyAnnotations.java b/flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/BeanPropertyAnnotations.java similarity index 81% rename from flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/BeanPropertyAnnotations.java rename to flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/BeanPropertyAnnotations.java index a374e63..a09562d 100644 --- a/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/BeanPropertyAnnotations.java +++ b/flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/BeanPropertyAnnotations.java @@ -6,6 +6,7 @@ import org.springframework.core.annotation.MergedAnnotation; import org.springframework.core.annotation.MergedAnnotations; import java.lang.annotation.Annotation; +import java.lang.reflect.AnnotatedElement; /** * 基于spring annotations最高级封装 @@ -17,6 +18,16 @@ import java.lang.annotation.Annotation; */ public interface BeanPropertyAnnotations { + /** + * 来自反射 + * + * @param annotated 字段 + * @return 结果 + */ + static BeanPropertyAnnotations from(AnnotatedElement annotated) { + return new SimpleBeanPropertyAnnotations(annotated); + } + /** * 判断是否有某个注解 * @@ -84,4 +95,17 @@ public interface BeanPropertyAnnotations { * @return 结果 */ BeanPropertyAnnotationBatchChain batchEmpty(); + + /** + * 强制类型转换 + * + * @param bean 入参 + * @param 入参泛型 + * @param 出参泛型 + * @return 结果 + */ + @SuppressWarnings("unchecked") + static R cast(T bean) { + return (R) bean; + } } diff --git a/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/SimpleBeanPropertyAnnotations.java b/flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/SimpleBeanPropertyAnnotations.java similarity index 91% rename from flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/SimpleBeanPropertyAnnotations.java rename to flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/SimpleBeanPropertyAnnotations.java index 08ce8ed..2e61374 100644 --- a/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/SimpleBeanPropertyAnnotations.java +++ b/flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/SimpleBeanPropertyAnnotations.java @@ -6,17 +6,18 @@ import dev.flyfish.framework.beans.meta.parser.chain.impl.EmptyAnnotationBatchCh import dev.flyfish.framework.beans.meta.parser.chain.impl.EmptyAnnotationChain; import dev.flyfish.framework.beans.meta.parser.chain.impl.SimpleAnnotationBatchChain; import dev.flyfish.framework.beans.meta.parser.chain.impl.SimpleAnnotationChain; -import org.apache.commons.collections4.CollectionUtils; import org.springframework.core.annotation.MergedAnnotation; import org.springframework.core.annotation.MergedAnnotations; -import org.springframework.data.util.CastUtils; +import org.springframework.util.CollectionUtils; import java.lang.annotation.Annotation; -import java.lang.reflect.Field; +import java.lang.reflect.AnnotatedElement; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; +import static dev.flyfish.framework.beans.meta.parser.BeanPropertyAnnotations.cast; + /** * bean属性注解容器 * @@ -24,14 +25,14 @@ import java.util.stream.Collectors; */ public class SimpleBeanPropertyAnnotations implements BeanPropertyAnnotations { - private final Field field; + private final AnnotatedElement field; private final MergedAnnotations annotations; private final EmptyAnnotationChain emptyChain = new EmptyAnnotationChain<>(this); private final EmptyAnnotationBatchChain emptyBatchChain = new EmptyAnnotationBatchChain<>(this); private boolean last; - public SimpleBeanPropertyAnnotations(Field field) { + SimpleBeanPropertyAnnotations(AnnotatedElement field) { this.field = field; this.annotations = null == field ? MergedAnnotations.from() : MergedAnnotations.from(field); } @@ -98,7 +99,7 @@ public class SimpleBeanPropertyAnnotations implements BeanPropertyAnnotations { List> values = this.annotations.stream(annotationType) .filter(MergedAnnotation::isPresent) .collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(values)) { + if (!CollectionUtils.isEmpty(values)) { return new SimpleAnnotationBatchChain<>(this.last(true), values); } } @@ -135,7 +136,7 @@ public class SimpleBeanPropertyAnnotations implements BeanPropertyAnnotations { */ @Override public BeanPropertyAnnotationChain empty() { - return CastUtils.cast(emptyChain); + return cast(emptyChain); } /** @@ -144,7 +145,8 @@ public class SimpleBeanPropertyAnnotations implements BeanPropertyAnnotations { * @return 结果 */ @Override + public BeanPropertyAnnotationBatchChain batchEmpty() { - return CastUtils.cast(emptyBatchChain); + return cast(emptyBatchChain); } } diff --git a/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/AnnotationChainSupport.java b/flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/AnnotationChainSupport.java similarity index 100% rename from flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/AnnotationChainSupport.java rename to flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/AnnotationChainSupport.java diff --git a/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/BeanPropertyAnnotationBatchChain.java b/flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/BeanPropertyAnnotationBatchChain.java similarity index 100% rename from flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/BeanPropertyAnnotationBatchChain.java rename to flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/BeanPropertyAnnotationBatchChain.java diff --git a/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/BeanPropertyAnnotationChain.java b/flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/BeanPropertyAnnotationChain.java similarity index 100% rename from flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/BeanPropertyAnnotationChain.java rename to flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/BeanPropertyAnnotationChain.java diff --git a/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/BasicAnnotationChainSupport.java b/flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/BasicAnnotationChainSupport.java similarity index 100% rename from flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/BasicAnnotationChainSupport.java rename to flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/BasicAnnotationChainSupport.java diff --git a/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationBatchChain.java b/flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationBatchChain.java similarity index 95% rename from flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationBatchChain.java rename to flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationBatchChain.java index 1832e7c..2b7c26a 100644 --- a/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationBatchChain.java +++ b/flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationBatchChain.java @@ -2,7 +2,6 @@ package dev.flyfish.framework.beans.meta.parser.chain.impl; import dev.flyfish.framework.beans.meta.parser.BeanPropertyAnnotations; import dev.flyfish.framework.beans.meta.parser.chain.BeanPropertyAnnotationBatchChain; -import org.springframework.data.util.CastUtils; import java.lang.annotation.Annotation; import java.util.Collections; @@ -12,6 +11,8 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.function.Supplier; +import static dev.flyfish.framework.beans.meta.parser.BeanPropertyAnnotations.cast; + /** * 单例的，空实现 * @@ -32,7 +33,7 @@ public class EmptyAnnotationBatchChain extends BasicAnn */ @Override public BeanPropertyAnnotationBatchChain map(Function mapper) { - return CastUtils.cast(this); + return cast(this); } /** diff --git a/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationChain.java b/flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationChain.java similarity index 95% rename from flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationChain.java rename to flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationChain.java index c889515..345cd54 100644 --- a/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationChain.java +++ b/flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationChain.java @@ -2,7 +2,6 @@ package dev.flyfish.framework.beans.meta.parser.chain.impl; import dev.flyfish.framework.beans.meta.parser.BeanPropertyAnnotations; import dev.flyfish.framework.beans.meta.parser.chain.BeanPropertyAnnotationChain; -import org.springframework.data.util.CastUtils; import java.lang.annotation.Annotation; import java.util.function.Consumer; @@ -10,6 +9,8 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.function.Supplier; +import static dev.flyfish.framework.beans.meta.parser.BeanPropertyAnnotations.cast; + /** * 单例的，空实现 * @@ -31,7 +32,7 @@ public class EmptyAnnotationChain extends BasicAnnotati */ @Override public BeanPropertyAnnotationChain map(Function mapper) { - return CastUtils.cast(this); + return cast(this); } /** diff --git a/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationBatchChain.java b/flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationBatchChain.java similarity index 94% rename from flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationBatchChain.java rename to flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationBatchChain.java index 19c4fa8..3c89943 100644 --- a/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationBatchChain.java +++ b/flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationBatchChain.java @@ -2,9 +2,8 @@ package dev.flyfish.framework.beans.meta.parser.chain.impl; import dev.flyfish.framework.beans.meta.parser.BeanPropertyAnnotations; import dev.flyfish.framework.beans.meta.parser.chain.BeanPropertyAnnotationBatchChain; -import org.apache.commons.collections4.CollectionUtils; import org.springframework.core.annotation.MergedAnnotation; -import org.springframework.data.util.CastUtils; +import org.springframework.util.CollectionUtils; import java.lang.annotation.Annotation; import java.util.Collections; @@ -16,6 +15,8 @@ import java.util.function.Predicate; import java.util.function.Supplier; import java.util.stream.Collectors; +import static dev.flyfish.framework.beans.meta.parser.BeanPropertyAnnotations.cast; + /** * 简单的批量注解链式实现 * @@ -50,8 +51,8 @@ public class SimpleAnnotationBatchChain extends BasicAn return parent.batchEmpty(); } this.mapped = true; - this.values = CastUtils.cast(list); - return CastUtils.cast(this); + this.values = cast(list); + return cast(this); } /** diff --git a/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationChain.java b/flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationChain.java similarity index 95% rename from flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationChain.java rename to flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationChain.java index d8268d9..ec8a7fa 100644 --- a/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationChain.java +++ b/flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationChain.java @@ -3,7 +3,6 @@ package dev.flyfish.framework.beans.meta.parser.chain.impl; import dev.flyfish.framework.beans.meta.parser.BeanPropertyAnnotations; import dev.flyfish.framework.beans.meta.parser.chain.BeanPropertyAnnotationChain; import org.springframework.core.annotation.MergedAnnotation; -import org.springframework.data.util.CastUtils; import java.lang.annotation.Annotation; import java.util.function.Consumer; @@ -11,6 +10,8 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.function.Supplier; +import static dev.flyfish.framework.beans.meta.parser.BeanPropertyAnnotations.cast; + /** * 简单的注解链 * @@ -40,8 +41,8 @@ public class SimpleAnnotationChain extends BasicAnnotat if (null == value) { return parent.empty(); } - this.value = CastUtils.cast(value); - return CastUtils.cast(this); + this.value = cast(value); + return cast(this); } /** diff --git a/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/po/User.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/po/User.java index 222fe4b..992c209 100644 --- a/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/po/User.java +++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/po/User.java @@ -120,7 +120,6 @@ public class User extends AuditDomain implements IUser { @Transient private Object detail; - @Override public User toUser() { return this; diff --git a/flyfish-web/pom.xml b/flyfish-web/pom.xml index c863a03..c9cd920 100644 --- a/flyfish-web/pom.xml +++ b/flyfish-web/pom.xml @@ -17,6 +17,11 @@ flyfish-data-common + + dev.flyfish.framework + flyfish-bean + + org.springframework.security spring-security-core diff --git a/flyfish-web/src/main/java/dev/flyfish/framework/beans/enums/ValidationCandidate.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/enums/ValidationCandidate.java index 4232291..0f6ae75 100644 --- a/flyfish-web/src/main/java/dev/flyfish/framework/beans/enums/ValidationCandidate.java +++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/enums/ValidationCandidate.java @@ -8,6 +8,7 @@ import dev.flyfish.framework.validation.annotations.Money; import dev.flyfish.framework.validation.annotations.Phone; import dev.flyfish.framework.validation.annotations.UniqueField; import dev.flyfish.framework.validation.enums.PhoneType; +import jakarta.validation.constraints.*; import lombok.Getter; import lombok.val; import org.apache.commons.lang3.ArrayUtils; @@ -17,7 +18,6 @@ import org.hibernate.validator.constraints.URL; import org.springframework.core.annotation.MergedAnnotation; import org.springframework.core.annotation.MergedAnnotations; -import jakarta.validation.constraints.*; import java.lang.annotation.Annotation; import java.util.Arrays; import java.util.List; diff --git a/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/BeanProperty.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/BeanProperty.java index 2ce59b3..15dcbf7 100644 --- a/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/BeanProperty.java +++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/BeanProperty.java @@ -7,13 +7,11 @@ import dev.flyfish.framework.annotations.*; import dev.flyfish.framework.beans.enums.ValidationCandidate; import dev.flyfish.framework.beans.meta.builtin.BeanUris; import dev.flyfish.framework.beans.meta.parser.BeanPropertyAnnotations; -import dev.flyfish.framework.beans.meta.parser.SimpleBeanPropertyAnnotations; import dev.flyfish.framework.domain.base.Qo; import dev.flyfish.framework.domain.base.Vo; import dev.flyfish.framework.utils.ReflectionUtils; import dev.flyfish.framework.utils.StringFormats; import dev.flyfish.framework.validation.annotations.Money; -import dev.flyfish.framework.annotations.*; import lombok.Data; import lombok.val; import org.apache.commons.collections4.CollectionUtils; @@ -119,7 +117,7 @@ public class BeanProperty { boolean strict = Qo.class.isAssignableFrom(beanClass) || Vo.class.isAssignableFrom(beanClass); // 尝试获取field Field field = FieldUtils.getField(beanClass, descriptor.getName(), true); - BeanPropertyAnnotations annotations = new SimpleBeanPropertyAnnotations(field); + BeanPropertyAnnotations annotations = BeanPropertyAnnotations.from(field); // 判断是否需要跳过，启用严格模式并未标记的属性，将直接跳过 boolean skip = null == field || !annotations.isPresent(Property.class); if (skip && strict) { diff --git a/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/BeanPropertyAnnotationParser.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/BeanPropertyAnnotationParser.java deleted file mode 100644 index 8f0facc..0000000 --- a/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/BeanPropertyAnnotationParser.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.flyfish.framework.beans.meta.parser; - -/** - * bean属性注解解析器 - * @author wangyu - */ -public class BeanPropertyAnnotationParser { - - -} diff --git a/pom.xml b/pom.xml index 0d692fa..e912578 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ - 2.0.0 + 2.0.1 flyfish 0.27.2 UTF-8 @@ -65,6 +65,7 @@ flyfish-form flyfish-approval flyfish-backup + flyfish-bean @@ -120,6 +121,12 @@ compile + + dev.flyfish.framework + flyfish-bean + ${revision} + + dev.flyfish.framework flyfish-data-relational