diff --git a/flyfish-approval/src/main/java/com/flyfish/framework/approval/service/ModuleDelegateService.java b/flyfish-approval/src/main/java/com/flyfish/framework/approval/service/ModuleDelegateService.java index 3b9fdc6..cc45e5c 100644 --- a/flyfish-approval/src/main/java/com/flyfish/framework/approval/service/ModuleDelegateService.java +++ b/flyfish-approval/src/main/java/com/flyfish/framework/approval/service/ModuleDelegateService.java @@ -39,6 +39,11 @@ public class ModuleDelegateService { // 审批的服务们 private Map> approvalServices; + private String getModuleName(BaseReactiveService service) { + return ReflectionUtils.getGenericType(service.getClass()).map(Class::getSimpleName) + .orElseThrow(() -> new InvalidBusinessException("系统模块名称抽取失败！")); + } + @Autowired @SuppressWarnings("all") public void setApprovalServices(ObjectProvider services) { @@ -47,7 +52,7 @@ public class ModuleDelegateService { .map(clazz -> ClassUtils.isAssignable(clazz, ApprovalDomain.class)) .orElse(false)) .map(service -> (BaseReactiveService) service) - .collect(Collectors.toMap(s -> s.getEntityInformation().getCollectionName(), s -> s)); + .collect(Collectors.toMap(this::getModuleName, s -> s)); } /** diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/chain/DefaultQueryMutation.java b/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/chain/DefaultQueryMutation.java index ebe1916..4b273d1 100644 --- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/chain/DefaultQueryMutation.java +++ b/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/chain/DefaultQueryMutation.java @@ -5,8 +5,7 @@ import com.flyfish.framework.query.*; import com.flyfish.framework.query.support.DomainFunction; import lombok.RequiredArgsConstructor; -import java.util.Arrays; -import java.util.List; +import java.util.Collections; /** * 默认的查询修改逻辑 @@ -24,6 +23,25 @@ public class DefaultQueryMutation implements QueryMutation { private final boolean within; + /** + * 根据实际的参数合并查询链 + * + * @param newChain 新链 + * @param

参数类型 + * @param 查询链类型 + * @return 结果 + */ + private > C merge(C newChain) { + if (within) { + // 内联模式，旧条件不修改 + newChain.and(Collections.singletonList(previous)); + } else { + // 修改模式，直接修改 + previous.and(newChain); + } + return newChain; + } + /** * 以lambda的形式修改 * 注意，如果之前用过lambda的形式，此处应该校验类型 @@ -33,11 +51,7 @@ public class DefaultQueryMutation implements QueryMutation { */ @Override public QueryCondition> and(DomainFunction getter) { - LambdaQueryChain newChain = new DefaultLambdaQueryChain<>(); - QueryCondition> condition = newChain.and(getter); - List> chains = Arrays.asList(previous, newChain); - previous.and(chains); - return condition; + return merge(new DefaultLambdaQueryChain()).and(getter); } /** @@ -48,7 +62,7 @@ public class DefaultQueryMutation implements QueryMutation { */ @Override public QueryCondition and(String column) { - return null; + return merge(new DefaultNamedQueryChain()).and(column); } /** @@ -59,7 +73,7 @@ public class DefaultQueryMutation implements QueryMutation { */ @Override public LambdaQueryChain and(LambdaQueryChain chain) { - return null; + return merge(chain); } /** @@ -70,7 +84,7 @@ public class DefaultQueryMutation implements QueryMutation { */ @Override public NamedQueryChain and(NamedQueryChain chain) { - return null; + return merge(chain); } /** @@ -82,7 +96,7 @@ public class DefaultQueryMutation implements QueryMutation { */ @Override public QueryCondition> or(DomainFunction getter) { - return null; + return merge(new DefaultLambdaQueryChain()).or(getter); } /** @@ -93,7 +107,7 @@ public class DefaultQueryMutation implements QueryMutation { */ @Override public QueryCondition or(String column) { - return null; + return merge(new DefaultNamedQueryChain()).or(column); } /** @@ -104,7 +118,7 @@ public class DefaultQueryMutation implements QueryMutation { */ @Override public LambdaQueryChain or(LambdaQueryChain chain) { - return null; + return merge(chain); } /** @@ -115,6 +129,6 @@ public class DefaultQueryMutation implements QueryMutation { */ @Override public NamedQueryChain or(NamedQueryChain chain) { - return null; + return merge(chain); } } diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/Domain.java b/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/Domain.java index 330f701..fb693de 100644 --- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/Domain.java +++ b/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/Domain.java @@ -11,7 +11,6 @@ import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Transient; import org.springframework.data.mongodb.core.index.Indexed; -import javax.persistence.Index; import javax.validation.constraints.NotBlank; import java.io.Serializable; diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/MongoQueryFactory.java b/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/MongoQueryFactory.java new file mode 100644 index 0000000..803dc92 --- /dev/null +++ b/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/MongoQueryFactory.java @@ -0,0 +1,39 @@ +package com.flyfish.framework.mongodb.query; + +import com.flyfish.framework.domain.base.Domain; +import com.flyfish.framework.mongodb.query.adaptor.MongoCriteriaAdaptor; +import com.flyfish.framework.mongodb.query.converter.MongoQueryConverter; +import com.flyfish.framework.query.spi.QueryFactory; +import com.flyfish.framework.query.spi.adaptor.CriteriaAdaptor; +import com.flyfish.framework.query.spi.converter.QueryConverter; +import org.springframework.data.mongodb.core.query.Criteria; +import org.springframework.data.mongodb.core.query.Query; +import org.springframework.data.mongodb.repository.query.MongoEntityInformation; +import org.springframework.data.repository.core.EntityInformation; + +/** + * mongo查询工厂 + * + * @author wangyu + */ +public class MongoQueryFactory implements QueryFactory { + + private final CriteriaAdaptor adaptor = new MongoCriteriaAdaptor(); + + private final QueryConverter converter = new MongoQueryConverter(adaptor); + + @Override + public boolean supports(EntityInformation entity) { + return entity instanceof MongoEntityInformation; + } + + @Override + public QueryConverter getConverter() { + return converter; + } + + @Override + public CriteriaAdaptor getAdaptor() { + return adaptor; + } +} diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/adaptor/MongoCriteriaAdaptor.java b/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/adaptor/MongoCriteriaAdaptor.java new file mode 100644 index 0000000..45b9d98 --- /dev/null +++ b/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/adaptor/MongoCriteriaAdaptor.java @@ -0,0 +1,103 @@ +package com.flyfish.framework.mongodb.query.adaptor; + +import com.flyfish.framework.query.Queries; +import com.flyfish.framework.query.spi.adaptor.CriteriaAdaptor; +import org.bson.types.ObjectId; +import org.springframework.data.mongodb.core.query.Criteria; + +import java.util.Collection; +import java.util.List; + +public class MongoCriteriaAdaptor implements CriteriaAdaptor { + + @Override + public Criteria and(Criteria first, Criteria other) { + return first.andOperator(other); + } + + @Override + public Criteria or(Criteria first, Criteria other) { + return first.orOperator(other); + } + + @Override + public Criteria eq(String column, Object value) { + return Criteria.where(column).is(value); + } + + @Override + public Criteria hasId(String column, Object value) { + return Criteria.where(column + ".$id").is(new ObjectId(String.valueOf(value))); + } + + @Override + public Criteria has(String column, Object value) { + return Criteria.where(column).is(value); + } + + @Override + public Criteria ne(String column, Object value) { + return Criteria.where(column).ne(value); + } + + @Override + public Criteria between(String column, List items) { + return Criteria.where(column).gte(items.get(0)).lte(items.get(1)); + } + + @Override + public Criteria like(String column, String keyword, Queries.Direction direction) { + // 匹配开头 + if (direction == Queries.Direction.LEFT) { + keyword = "^" + keyword; + } else if (direction == Queries.Direction.RIGHT) { + keyword = keyword + "$"; + } + return Criteria.where(column).regex(keyword); + } + + @Override + public Criteria isNull(String column) { + return Criteria.where(column).isNull(); + } + + @Override + public Criteria lt(String column, Object value) { + return Criteria.where(column).lt(value); + } + + @Override + public Criteria lte(String column, Object value) { + return Criteria.where(column).lte(value); + } + + @Override + public Criteria gt(String column, Object value) { + return Criteria.where(column).gt(value); + } + + @Override + public Criteria gte(String column, Object value) { + return Criteria.where(column).gte(value); + } + + @Override + public Criteria in(String column, Collection values) { + return Criteria.where(column).in(values); + } + + @Override + public Criteria in(String column, Object... values) { + return Criteria.where(column).in(values); + } + + @Override + public Criteria nin(String column, Object... values) { + return Criteria.where(column).nin(values); + } + + @Override + public Criteria nin(String column, Collection values) { + return Criteria.where(column).nin(values); + } +} diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/converter/MongoQueryConverter.java b/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/converter/MongoQueryConverter.java index ab5a2b2..e158bd6 100644 --- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/converter/MongoQueryConverter.java +++ b/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/converter/MongoQueryConverter.java @@ -1,25 +1,16 @@ package com.flyfish.framework.mongodb.query.converter; -import com.flyfish.framework.domain.base.Domain; +import com.flyfish.framework.query.spi.adaptor.CriteriaAdaptor; import com.flyfish.framework.query.spi.converter.QueryConverter; +import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; -import org.springframework.data.mongodb.repository.query.MongoEntityInformation; -import org.springframework.data.repository.core.EntityInformation; +@RequiredArgsConstructor public class MongoQueryConverter implements QueryConverter { - /** - * 判断是否支持实体 - * - * @param entity 实体信息 - * @return 结果 - */ - @Override - public boolean supports(EntityInformation entity) { - return entity instanceof MongoEntityInformation; - } + private final CriteriaAdaptor adaptor; /** * 转换查询 @@ -62,7 +53,7 @@ public class MongoQueryConverter implements QueryConverter { } // 如果存在查询定义，直接使用查询定义 if (null != query.getDefinition()) { - return query.getDefinition().build(); + return query.getDefinition().build(adaptor); } return null; } diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/factory/MongoLambdaQueryFactory.java b/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/factory/MongoLambdaQueryFactory.java deleted file mode 100644 index 6bba662..0000000 --- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/factory/MongoLambdaQueryFactory.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.flyfish.framework.mongodb.query.factory; - -import com.flyfish.framework.domain.base.Domain; -import com.flyfish.framework.mongodb.query.impl.MongoLambdaQueryChain; -import com.flyfish.framework.query.LambdaQueryChain; -import com.flyfish.framework.query.spi.QueryChainFactory; - -/** - * mongo lambda 查询工厂 - * - * @author wangyu - */ -public class MongoLambdaQueryFactory implements QueryChainFactory> { - - /** - * 生产适配器 - * 此接口为高度抽象接口，目的是兼容更多的查询链类型，便于后续扩展 - * - * @return 生产结果 - */ - @Override - public LambdaQueryChain produce() { - return new MongoLambdaQueryChain<>(); - } - - /** - * 判定是否支持特定的实例类型 - * - * @param targetType 工厂目标类型 - * @return 是否匹配 - */ - @Override - public boolean supports(Class targetType) { - return targetType.isAssignableFrom(MongoLambdaQueryChain.class); - } -} diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/factory/MongoNamedQueryFactory.java b/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/factory/MongoNamedQueryFactory.java deleted file mode 100644 index 92444e7..0000000 --- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/factory/MongoNamedQueryFactory.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.flyfish.framework.mongodb.query.factory; - -import com.flyfish.framework.mongodb.query.impl.MongoNamedQueryChain; -import com.flyfish.framework.query.NamedQueryChain; -import com.flyfish.framework.query.spi.QueryChainFactory; - -/** - * mongo名称查询工厂 - * - * @author wangyu - */ -public class MongoNamedQueryFactory implements QueryChainFactory { - - /** - * 生产适配器 - * 此接口为高度抽象接口，目的是兼容更多的查询链类型，便于后续扩展 - * - * @return 生产结果 - */ - @Override - public NamedQueryChain produce() { - return new MongoNamedQueryChain(); - } - - /** - * 判定是否支持特定的实例类型 - * - * @param targetType 工厂目标类型 - * @return 是否匹配 - */ - @Override - public boolean supports(Class targetType) { - return targetType.isAssignableFrom(MongoNamedQueryChain.class); - } -} diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/impl/MongoLambdaQueryChain.java b/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/impl/MongoLambdaQueryChain.java deleted file mode 100644 index 04687af..0000000 --- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/impl/MongoLambdaQueryChain.java +++ /dev/null @@ -1,239 +0,0 @@ -package com.flyfish.framework.mongodb.query.impl; - -import com.flyfish.framework.domain.base.Domain; -import com.flyfish.framework.query.LambdaQueryChain; -import com.flyfish.framework.query.Queries; -import com.flyfish.framework.query.QueryChain; -import com.flyfish.framework.query.QueryCondition; -import com.flyfish.framework.query.support.DomainFunction; -import lombok.RequiredArgsConstructor; - -import java.util.Collection; -import java.util.List; -import java.util.function.Supplier; - -/** - * mongodb实现的基于lambda的查询链 - * - * @author wangyu - */ -public class MongoLambdaQueryChain extends MongoQueryDefinition implements LambdaQueryChain { - - /** - * 以且连接下一个字段 - * - * @param column 列 - * @return 查询条件 - */ - @Override - public QueryCondition> and(DomainFunction column) { - return null; - } - - /** - * 直接拼接提供者，此处懒加载，最终build才会执行 - * - * @param supplier 提供者 - * @return 结果 - */ - @Override - public > LambdaQueryChain and(Supplier> supplier) { - return null; - } - - /** - * 条件列表 - * - * @param chain 多个条件们 - * @return 结果 - */ - @Override - public LambdaQueryChain and(LambdaQueryChain chain) { - return null; - } - - /** - * 多个嵌套子条件列表 - * - * @param lambdaQueryChains 多条链 - * @param combinator 各个链条之间的连接方式 - * @return 结果 - */ - @Override - public LambdaQueryChain and(List> lambdaQueryChains, Queries.Combinator combinator) { - return null; - } - - /** - * 以或连接下一个字段 - * - * @param column 列 - * @return 查询条件 - */ - @Override - public QueryCondition> or(DomainFunction column) { - return null; - } - - /** - * 以或连接条件列表 - * - * @param chain 多个条件们 - * @return 结果 - */ - @Override - public LambdaQueryChain or(LambdaQueryChain chain) { - return null; - } - - /** - * 以或连接嵌套多个子条件列表 - * - * @param lambdaQueryChains 多条链 - * @param combinator 各个链条之间的连接方式 - * @return 结果 - */ - @Override - public LambdaQueryChain or(List> lambdaQueryChains, Queries.Combinator combinator) { - return null; - } - - /** - * 直接拼接提供者，此处懒加载，最终build才会执行 - * - * @param supplier 提供者 - * @return 结果 - */ - @Override - public > LambdaQueryChain or(Supplier> supplier) { - return null; - } - - /** - * 用于lambda的条件拼接 - */ - @RequiredArgsConstructor - class LambdaQueryCondition implements QueryCondition> { - - private final DomainFunction field; - - /** - * 相等判定 - * - * @param value 值 - * @return 结果 - */ - @Override - public LambdaQueryChain eq(Object value) { - criteria.and("").is(value); - return MongoLambdaQueryChain.this; - } - - /** - * 判定某列的值中存在指定值，特指json array数据类型且子类型中带有id的场景 - * 用于兼容mongodb查询，mysql查询使用JSON_CONTAINS进行判定。 - * 当且仅当mongodb会拼接.$id，mysql一律匹配id字段 - *

- * 等价于 .eq(value) - * - * @param value 值 - * @return 结果 - */ - @Override - public LambdaQueryChain hasId(Object value) { - return null; - } - - /** - * 对于mongodb，自动处理。对于关系型数据库，代表json array中是否包含对应值，值仅支持基本数据类型 - *

- * 等价于 .eq(value) - * - * @param value 基本数据类型的值 - * @return 结果 - */ - @Override - public LambdaQueryChain has(Object value) { - return null; - } - - /** - * 不等判定 - * - * @param value 值 - * @return 结果 - */ - @Override - public LambdaQueryChain ne(Object value) { - return null; - } - - /** - * 值介于两者之间 - * - * @param items 双值列表 - * @return 结果 - */ - @Override - public LambdaQueryChain between(List items) { - return null; - } - - /** - * 模糊匹配，这里是全模糊 - * - * @param keyword 查询关键字 - * @return 结果 - */ - @Override - public LambdaQueryChain like(String keyword) { - return null; - } - - /** - * 根据指定的方向进行模糊查询 - * - * @param keyword 关键字 - * @param direction 方向，可以匹配开头和结尾 - * @return 结果 - */ - @Override - public LambdaQueryChain like(String keyword, Queries.Direction direction) { - return null; - } - - /** - * 判定为空 - * - * @return 结果 - */ - @Override - public LambdaQueryChain isNull() { - return null; - } - - /** - * 包含在内 - * - * @param list 集合 - * @return 结果 - */ - @Override - public LambdaQueryChain in(Collection list) { - return null; - } - - /** - * 包含在内 - * 注意，需要根据字段类型推断。 - * 如果是json数组，需要进行双向匹配 - * - * @param values 值们 - * @return 结果 - */ - @Override - public LambdaQueryChain in(Object... values) { - return null; - } - } -} diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/impl/MongoNamedQueryChain.java b/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/impl/MongoNamedQueryChain.java deleted file mode 100644 index 99fac7f..0000000 --- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/impl/MongoNamedQueryChain.java +++ /dev/null @@ -1,318 +0,0 @@ -package com.flyfish.framework.mongodb.query.impl; - -import com.flyfish.framework.query.NamedQueryChain; -import com.flyfish.framework.query.Queries; -import com.flyfish.framework.query.QueryChain; -import com.flyfish.framework.query.QueryCondition; -import com.flyfish.framework.query.holder.QueryChainHolder; -import lombok.RequiredArgsConstructor; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.StringUtils; -import org.bson.types.ObjectId; -import org.springframework.data.mongodb.core.query.Criteria; - -import java.util.Collection; -import java.util.List; -import java.util.function.Supplier; - -/** - * mongodb实现的基于名称的查询链 - * 这里需要一个机制，能够将父类上下文带入，并且能够知晓实际查询对象的连接方式 - * 这就需要用到观察者模式，以便延迟执行。将动作作为事件发布到对象里，在具体的执行时机再进行fire。 - * 于是乎，我们便可以优雅而且低耦合的实现链式了。 - * - * @author wangyu - */ -public class MongoNamedQueryChain extends MongoQueryDefinition implements NamedQueryChain { - - /** - * 以且连接下一个字段 - * - * @param column 列 - * @return 查询条件 - */ - @Override - public QueryCondition and(String column) { - and(); - return new NamedQueryCondition(column); - } - - /** - * 直接拼接提供者，此处懒加载，最终build才会执行 - * - * @param supplier 提供者 - * @return 结果 - */ - @Override - public > NamedQueryChain and(Supplier> supplier) { - and().with(() -> supplier.get().build()); - return this; - } - - /** - * 条件列表 - * - * @param chain 多个条件们 - * @return 结果 - */ - @Override - public NamedQueryChain and(NamedQueryChain chain) { - and().with(chain::build); - return this; - } - - /** - * 多个嵌套子条件列表 - * - * @param chains 多条链 - * @param combinator 各个链条之间的连接方式 - * @return 结果 - */ - @Override - public NamedQueryChain and(List chains, Queries.Combinator combinator) { - return and(combine(chains, combinator)); - } - - /** - * 以或连接下一个字段 - * - * @param column 列 - * @return 查询条件 - */ - @Override - public QueryCondition or(String column) { - or(); - return new NamedQueryCondition(column); - } - - /** - * 以或连接条件列表 - * - * @param chain 多个条件们 - * @return 结果 - */ - @Override - public NamedQueryChain or(NamedQueryChain chain) { - or().with(chain::build); - return this; - } - - /** - * 以或连接嵌套多个子条件列表 - * - * @param chains 多条链 - * @param combinator 各个链条之间的连接方式 - * @return 结果 - */ - @Override - public NamedQueryChain or(List chains, Queries.Combinator combinator) { - return or(combine(chains, combinator)); - } - - /** - * 直接拼接提供者，此处懒加载，最终build才会执行 - * - * @param supplier 提供者 - * @return 结果 - */ - @Override - public > NamedQueryChain or(Supplier> supplier) { - or().with(() -> supplier.get().build()); - return this; - } - - /** - * 以且的关系进行拼接 - * - * @return 结果 - */ - private QueryChainHolder and() { - return holder.link(Criteria::andOperator); - } - - /** - * 以或的关系进行拼接 - * - * @return 结果 - */ - private QueryChainHolder or() { - return holder.link(Criteria::orOperator); - } - - /** - * 结合多个查询链，并根据组合方式进行处理 - * - * @param chains 查询链集合 - * @param combinator 组合方式 - * @return 结果 - */ - private NamedQueryChain combine(List chains, Queries.Combinator combinator) { - return chains.stream().reduce((left, right) -> combinator == Queries.Combinator.OR ? left.or(right) : left.and(right)) - .orElse(new MongoNamedQueryChain()); - } - - - /** - * 条件操作实现 - * - * @author wangyu - */ - @RequiredArgsConstructor - class NamedQueryCondition implements QueryCondition { - - private final String column; - - /** - * 相等判定 - * - * @param value 值 - * @return 结果 - */ - @Override - public NamedQueryChain eq(Object value) { - if (null != value) { - holder.with(Criteria.where(column).is(value)); - } - return MongoNamedQueryChain.this; - } - - /** - * 判定某列的值中存在指定值，特指json array数据类型且子类型中带有id的场景 - * 用于兼容mongodb查询，mysql查询使用JSON_CONTAINS进行判定。 - * 当且仅当mongodb会拼接.$id，mysql一律匹配id字段 - *

- * 等价于 .eq(value) - * - * @param value 值 - * @return 结果 - */ - @Override - public NamedQueryChain hasId(Object value) { - if (null != value) { - holder.with(Criteria.where(column + ".$id").is(new ObjectId(String.valueOf(value)))); - } - return MongoNamedQueryChain.this; - } - - /** - * 对于mongodb，自动处理。对于关系型数据库，代表json array中是否包含对应值，值仅支持基本数据类型 - *

- * 等价于 .eq(value) - * - * @param value 基本数据类型的值 - * @return 结果 - */ - @Override - public NamedQueryChain has(Object value) { - if (null != value) { - holder.with(Criteria.where(column).is(value)); - } - return MongoNamedQueryChain.this; - } - - /** - * 不等判定 - * - * @param value 值 - * @return 结果 - */ - @Override - public NamedQueryChain ne(Object value) { - if (null != value) { - holder.with(Criteria.where(column).ne(value)); - } - return MongoNamedQueryChain.this; - } - - /** - * 值介于两者之间 - * - * @param items 双值列表 - * @return 结果 - */ - @Override - public NamedQueryChain between(List items) { - if (CollectionUtils.size(items) == 2) { - holder.with(Criteria.where(column).gte(items.get(0)).lte(items.get(1))); - } - return MongoNamedQueryChain.this; - } - - /** - * 模糊匹配，这里是全模糊 - * - * @param keyword 查询关键字 - * @return 结果 - */ - @Override - public NamedQueryChain like(String keyword) { - if (StringUtils.isNotBlank(keyword)) { - holder.with(Criteria.where(column).regex(keyword)); - } - return MongoNamedQueryChain.this; - } - - /** - * 根据指定的方向进行模糊查询 - * - * @param keyword 关键字 - * @param direction 方向，可以匹配开头和结尾 - * @return 结果 - */ - @Override - public NamedQueryChain like(String keyword, Queries.Direction direction) { - if (StringUtils.isNotBlank(keyword)) { - // 匹配开头 - if (direction == Queries.Direction.LEFT) { - keyword = "^" + keyword; - } else if (direction == Queries.Direction.RIGHT) { - keyword = keyword + "$"; - } - holder.with(Criteria.where(column).regex(keyword)); - } - return MongoNamedQueryChain.this; - } - - /** - * 判定为空 - * - * @return 结果 - */ - @Override - public NamedQueryChain isNull() { - holder.with(Criteria.where(column).isNull()); - return MongoNamedQueryChain.this; - } - - /** - * 包含在内 - * - * @param list 集合 - * @return 结果 - */ - @Override - public NamedQueryChain in(Collection list) { - if (CollectionUtils.isNotEmpty(list)) { - holder.with(Criteria.where(column).in(list)); - } - return MongoNamedQueryChain.this; - } - - /** - * 包含在内 - * 注意，需要根据字段类型推断。 - * 如果是json数组，需要进行双向匹配 - * - * @param values 值们 - * @return 结果 - */ - @Override - public NamedQueryChain in(Object... values) { - if (ArrayUtils.isNotEmpty(values)) { - holder.with(Criteria.where(column).in(values)); - } - return MongoNamedQueryChain.this; - } - } -} diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/impl/MongoQueryChainHolder.java b/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/impl/MongoQueryChainHolder.java deleted file mode 100644 index b1ed94e..0000000 --- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/impl/MongoQueryChainHolder.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.flyfish.framework.mongodb.query.impl; - -import com.flyfish.framework.query.holder.QueryChainHolder; -import org.springframework.data.mongodb.core.query.Criteria; - -import java.util.function.BinaryOperator; -import java.util.function.Supplier; - -class MongoQueryChainHolder implements QueryChainHolder { - - /** - * 等待下一步消费 - * - * @param operator 操作方法 - * @return 本身 - */ - @Override - public QueryChainHolder link(BinaryOperator operator) { - return null; - } - - /** - * 拼接条件 - * - * @param criteria 条件 - */ - @Override - public void with(Criteria criteria) { - - } - - /** - * 拼接懒加载的条件 - * - * @param supplier 条件提供者 - */ - @Override - public void with(Supplier supplier) { - - } - - /** - * 触发动作，得到最终的 - * - * @return 本身 - */ - @Override - public Criteria get() { - return null; - } - - /** - * 判断条件是否为空 - * - * @return 结果 - */ - @Override - public boolean isEmpty() { - return false; - } -} diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/impl/MongoQueryDefinition.java b/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/impl/MongoQueryDefinition.java deleted file mode 100644 index 2be68cd..0000000 --- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/impl/MongoQueryDefinition.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.flyfish.framework.mongodb.query.impl; - -import com.flyfish.framework.query.QueryDefinition; -import com.flyfish.framework.query.QueryMutation; - -/** - * mongo的查询定义 - * - * @author wangyu - */ -class MongoQueryDefinition implements QueryDefinition { - - protected final MongoQueryChainHolder holder = new MongoQueryChainHolder(); - - /** - * 构建 - * - * @return 构建结果 - */ - @SuppressWarnings("unchecked") - @Override - public T build() { - return (T) holder.get(); - } - - /** - * 修改，此修改会直接接着查询条件进行拼接 - * - * @return 修改句柄 - */ - @Override - public QueryMutation mutate() { - return null; - } - - /** - * 会直接添加嵌套查询到当前查询末尾 - * - * @return 修改句柄 - */ - @Override - public QueryMutation within() { - return null; - } - - /** - * 判断查询条件是否为空 - * - * @return 结果 - */ - @Override - public boolean isEmpty() { - return holder.isEmpty(); - } -} diff --git a/flyfish-data/flyfish-data-mongodb/src/main/resources/META-INF/spring.factories b/flyfish-data/flyfish-data-mongodb/src/main/resources/META-INF/spring.factories index 9f8a780..40e4d74 100644 --- a/flyfish-data/flyfish-data-mongodb/src/main/resources/META-INF/spring.factories +++ b/flyfish-data/flyfish-data-mongodb/src/main/resources/META-INF/spring.factories @@ -1,9 +1,4 @@ -com.flyfish.framework.query.spi.QueryChainFactory=\ - com.flyfish.framework.mongodb.query.factory.MongoNamedQueryFactory,\ - com.flyfish.framework.mongodb.query.factory.MongoLambdaQueryFactory - -com.flyfish.framework.query.spi.converter.QueryConverter=\ - com.flyfish.framework.mongodb.query.converter.MongoQueryConverter - +com.flyfish.framework.query.spi.QueryFactory=\ + com.flyfish.framework.mongodb.query.MongoQueryFactory org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ com.flyfish.framework.mongodb.config.MongoDataConfig diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/R2dbcQueryFactory.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/R2dbcQueryFactory.java new file mode 100644 index 0000000..b3da79c --- /dev/null +++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/R2dbcQueryFactory.java @@ -0,0 +1,39 @@ +package com.flyfish.framework.r2dbc.query; + +import com.flyfish.framework.domain.base.Domain; +import com.flyfish.framework.query.spi.QueryFactory; +import com.flyfish.framework.query.spi.adaptor.CriteriaAdaptor; +import com.flyfish.framework.query.spi.converter.QueryConverter; +import com.flyfish.framework.r2dbc.query.adaptor.R2dbcCriteriaAdaptor; +import com.flyfish.framework.r2dbc.query.converter.R2dbcQueryConverter; +import org.springframework.data.relational.core.query.Criteria; +import org.springframework.data.relational.core.query.Query; +import org.springframework.data.relational.repository.query.RelationalEntityInformation; +import org.springframework.data.repository.core.EntityInformation; + +/** + * r2dbc查询工厂 + * + * @author wangyu + */ +public class R2dbcQueryFactory implements QueryFactory { + + private final CriteriaAdaptor adaptor = new R2dbcCriteriaAdaptor(); + + private final QueryConverter converter = new R2dbcQueryConverter(adaptor); + + @Override + public boolean supports(EntityInformation entity) { + return entity instanceof RelationalEntityInformation; + } + + @Override + public QueryConverter getConverter() { + return converter; + } + + @Override + public CriteriaAdaptor getAdaptor() { + return adaptor; + } +} diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/adaptor/R2dbcCriteriaAdaptor.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/adaptor/R2dbcCriteriaAdaptor.java new file mode 100644 index 0000000..c3a5b5d --- /dev/null +++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/adaptor/R2dbcCriteriaAdaptor.java @@ -0,0 +1,109 @@ +package com.flyfish.framework.r2dbc.query.adaptor; + +import com.flyfish.framework.query.Queries; +import com.flyfish.framework.query.spi.adaptor.CriteriaAdaptor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.data.relational.core.query.Criteria; + +import java.util.Collection; +import java.util.List; + +/** + * r2dbc查询适配器 + * + * @author wangyu + */ +public class R2dbcCriteriaAdaptor implements CriteriaAdaptor { + + @Override + public Criteria and(Criteria first, Criteria other) { + return first.and(other); + } + + @Override + public Criteria or(Criteria first, Criteria other) { + return first.or(other); + } + + @Override + public Criteria eq(String column, Object value) { + return Criteria.where(column).is(value); + } + + @Override + public Criteria hasId(String column, Object value) { + throw new UnsupportedOperationException("暂时不支持嵌套操作"); + } + + @Override + public Criteria has(String column, Object value) { + throw new UnsupportedOperationException("暂时不支持嵌套操作"); + } + + @Override + public Criteria ne(String column, Object value) { + return Criteria.where(column).not(value); + } + + @Override + public Criteria between(String column, List items) { + return Criteria.where(column).between(items.get(0), items.get(1)); + } + + @Override + public Criteria like(String column, String keyword, Queries.Direction direction) { + if (direction == Queries.Direction.LEFT) { + keyword = keyword + "%"; + } else if (direction == Queries.Direction.RIGHT) { + keyword = "%" + keyword; + } else { + keyword = StringUtils.wrap(keyword, "%"); + } + return Criteria.where(column).like(keyword); + } + + @Override + public Criteria isNull(String column) { + return Criteria.where(column).isNull(); + } + + @Override + public Criteria lt(String column, Object value) { + return Criteria.where(column).lessThan(value); + } + + @Override + public Criteria lte(String column, Object value) { + return Criteria.where(column).lessThanOrEquals(value); + } + + @Override + public Criteria gt(String column, Object value) { + return Criteria.where(column).greaterThan(value); + } + + @Override + public Criteria gte(String column, Object value) { + return Criteria.where(column).greaterThanOrEquals(value); + } + + @Override + public Criteria in(String column, Collection values) { + return Criteria.where(column).in(values); + } + + @Override + public Criteria in(String column, Object... values) { + return Criteria.where(column).in(values); + } + + @Override + public Criteria nin(String column, Object... values) { + return Criteria.where(column).notIn(values); + } + + @Override + public Criteria nin(String column, Collection values) { + return Criteria.where(column).notIn(values); + } +} diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/converter/R2dbcQueryConverter.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/converter/R2dbcQueryConverter.java index 8d5dfd5..1334003 100644 --- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/converter/R2dbcQueryConverter.java +++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/converter/R2dbcQueryConverter.java @@ -1,16 +1,17 @@ package com.flyfish.framework.r2dbc.query.converter; -import com.flyfish.framework.domain.base.Domain; +import com.flyfish.framework.context.SpringContext; +import com.flyfish.framework.query.spi.adaptor.CriteriaAdaptor; import com.flyfish.framework.query.spi.converter.QueryConverter; -import lombok.Setter; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.data.domain.Example; +import org.springframework.data.r2dbc.mapping.R2dbcMappingContext; import org.springframework.data.relational.core.query.Criteria; import org.springframework.data.relational.core.query.Query; -import org.springframework.data.relational.repository.query.RelationalEntityInformation; import org.springframework.data.relational.repository.query.RelationalExampleMapper; -import org.springframework.data.repository.core.EntityInformation; +import org.springframework.util.function.SingletonSupplier; import java.util.Optional; @@ -20,20 +21,16 @@ import java.util.Optional; * @author wangyu */ @Slf4j +@RequiredArgsConstructor public class R2dbcQueryConverter implements QueryConverter { - @Setter - private static RelationalExampleMapper exampleMapper; + private final CriteriaAdaptor adaptor; - /** - * 判断是否支持实体 - * - * @param entity 实体信息 - * @return 结果 - */ - @Override - public boolean supports(EntityInformation entity) { - return entity instanceof RelationalEntityInformation; + private final SingletonSupplier exampleMapper = SingletonSupplier.of(R2dbcQueryConverter::getExampleMapper); + + private static RelationalExampleMapper getExampleMapper() { + R2dbcMappingContext context = SpringContext.getBean(R2dbcMappingContext.class); + return new RelationalExampleMapper(context); } /** @@ -80,7 +77,7 @@ public class R2dbcQueryConverter implements QueryConverter { } // 如果存在查询定义，直接使用查询定义 if (null != query.getDefinition()) { - return (Criteria) query.getDefinition().build(); + return query.getDefinition().build(adaptor); } return null; } @@ -92,7 +89,7 @@ public class R2dbcQueryConverter implements QueryConverter { * @return 结果 */ private Optional ofExample(Example example) { - return exampleMapper.getMappedExample(example).getCriteria() + return exampleMapper.obtain().getMappedExample(example).getCriteria() .map(cd -> (Criteria) cd); } } diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/factory/R2dbcLambdaQueryFactory.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/factory/R2dbcLambdaQueryFactory.java deleted file mode 100644 index 0f84d03..0000000 --- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/factory/R2dbcLambdaQueryFactory.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.flyfish.framework.r2dbc.query.factory; - -import com.flyfish.framework.domain.base.Domain; -import com.flyfish.framework.query.LambdaQueryChain; -import com.flyfish.framework.query.spi.QueryChainFactory; -import com.flyfish.framework.r2dbc.query.impl.R2dbcLambdaQueryChain; - -/** - * mongo lambda 查询工厂 - * - * @author wangyu - */ -public class R2dbcLambdaQueryFactory implements QueryChainFactory> { - - /** - * 生产适配器 - * 此接口为高度抽象接口，目的是兼容更多的查询链类型，便于后续扩展 - * - * @return 生产结果 - */ - @Override - public LambdaQueryChain produce() { - return new R2dbcLambdaQueryChain<>(); - } - - /** - * 判定是否支持特定的实例类型 - * - * @param targetType 工厂目标类型 - * @return 是否匹配 - */ - @Override - public boolean supports(Class targetType) { - return targetType.isAssignableFrom(R2dbcLambdaQueryChain.class); - } -} diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/factory/R2dbcNamedQueryFactory.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/factory/R2dbcNamedQueryFactory.java deleted file mode 100644 index 68d1dd1..0000000 --- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/factory/R2dbcNamedQueryFactory.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.flyfish.framework.r2dbc.query.factory; - -import com.flyfish.framework.query.NamedQueryChain; -import com.flyfish.framework.query.spi.QueryChainFactory; -import com.flyfish.framework.r2dbc.query.impl.R2dbcNamedQueryChain; - -/** - * mongo名称查询工厂 - * - * @author wangyu - */ -public class R2dbcNamedQueryFactory implements QueryChainFactory { - - /** - * 生产适配器 - * 此接口为高度抽象接口，目的是兼容更多的查询链类型，便于后续扩展 - * - * @return 生产结果 - */ - @Override - public NamedQueryChain produce() { - return new R2dbcNamedQueryChain(); - } - - /** - * 判定是否支持特定的实例类型 - * - * @param targetType 工厂目标类型 - * @return 是否匹配 - */ - @Override - public boolean supports(Class targetType) { - return targetType.isAssignableFrom(R2dbcNamedQueryChain.class); - } -} diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/impl/R2dbcLambdaQueryChain.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/impl/R2dbcLambdaQueryChain.java deleted file mode 100644 index 4927f59..0000000 --- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/impl/R2dbcLambdaQueryChain.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.flyfish.framework.r2dbc.query.impl; - -import com.flyfish.framework.domain.base.Domain; -import com.flyfish.framework.query.LambdaQueryChain; -import com.flyfish.framework.query.Queries; -import com.flyfish.framework.query.QueryChain; -import com.flyfish.framework.query.QueryCondition; -import com.flyfish.framework.query.support.DomainFunction; - -import java.util.List; -import java.util.function.Supplier; - -/** - * mongodb实现的基于lambda的查询链 - * - * @author wangyu - */ -public class R2dbcLambdaQueryChain extends R2dbcQueryDefinition implements LambdaQueryChain { - - /** - * 以且连接下一个字段 - * - * @param column 列 - * @return 查询条件 - */ - @Override - public QueryCondition> and(DomainFunction column) { - return null; - } - - /** - * 直接拼接提供者，此处懒加载，最终build才会执行 - * - * @param supplier 提供者 - * @return 结果 - */ - @Override - public > LambdaQueryChain and(Supplier> supplier) { - return null; - } - - /** - * 条件列表 - * - * @param chain 多个条件们 - * @return 结果 - */ - @Override - public LambdaQueryChain and(LambdaQueryChain chain) { - return null; - } - - /** - * 多个嵌套子条件列表 - * - * @param lambdaQueryChains 多条链 - * @param combinator 各个链条之间的连接方式 - * @return 结果 - */ - @Override - public LambdaQueryChain and(List> lambdaQueryChains, Queries.Combinator combinator) { - return null; - } - - /** - * 以或连接下一个字段 - * - * @param column 列 - * @return 查询条件 - */ - @Override - public QueryCondition> or(DomainFunction column) { - return null; - } - - /** - * 以或连接条件列表 - * - * @param chain 多个条件们 - * @return 结果 - */ - @Override - public LambdaQueryChain or(LambdaQueryChain chain) { - return null; - } - - /** - * 以或连接嵌套多个子条件列表 - * - * @param lambdaQueryChains 多条链 - * @param combinator 各个链条之间的连接方式 - * @return 结果 - */ - @Override - public LambdaQueryChain or(List> lambdaQueryChains, Queries.Combinator combinator) { - return null; - } - - /** - * 直接拼接提供者，此处懒加载，最终build才会执行 - * - * @param supplier 提供者 - * @return 结果 - */ - @Override - public > LambdaQueryChain or(Supplier> supplier) { - return null; - } -} diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/impl/R2dbcNamedQueryChain.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/impl/R2dbcNamedQueryChain.java deleted file mode 100644 index f8485bd..0000000 --- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/impl/R2dbcNamedQueryChain.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.flyfish.framework.r2dbc.query.impl; - -import com.flyfish.framework.query.NamedQueryChain; -import com.flyfish.framework.query.Queries; -import com.flyfish.framework.query.QueryChain; -import com.flyfish.framework.query.QueryCondition; - -import java.util.List; -import java.util.function.Supplier; - -/** - * mongodb实现的基于名称的查询链 - * - * @author wangyu - */ -public class R2dbcNamedQueryChain extends R2dbcQueryDefinition implements NamedQueryChain { - - /** - * 以且连接下一个字段 - * - * @param column 列 - * @return 查询条件 - */ - @Override - public QueryCondition and(String column) { - return null; - } - - /** - * 直接拼接提供者，此处懒加载，最终build才会执行 - * - * @param supplier 提供者 - * @return 结果 - */ - @Override - public > NamedQueryChain and(Supplier> supplier) { - return null; - } - - /** - * 条件列表 - * - * @param chain 多个条件们 - * @return 结果 - */ - @Override - public NamedQueryChain and(NamedQueryChain chain) { - return null; - } - - /** - * 多个嵌套子条件列表 - * - * @param chains 多条链 - * @param combinator 各个链条之间的连接方式 - * @return 结果 - */ - @Override - public NamedQueryChain and(List chains, Queries.Combinator combinator) { - return null; - } - - /** - * 以或连接下一个字段 - * - * @param column 列 - * @return 查询条件 - */ - @Override - public QueryCondition or(String column) { - return null; - } - - /** - * 以或连接条件列表 - * - * @param chain 多个条件们 - * @return 结果 - */ - @Override - public NamedQueryChain or(NamedQueryChain chain) { - return null; - } - - /** - * 以或连接嵌套多个子条件列表 - * - * @param chains 多条链 - * @param combinator 各个链条之间的连接方式 - * @return 结果 - */ - @Override - public NamedQueryChain or(List chains, Queries.Combinator combinator) { - return null; - } - - /** - * 直接拼接提供者，此处懒加载，最终build才会执行 - * - * @param supplier 提供者 - * @return 结果 - */ - @Override - public > NamedQueryChain or(Supplier> supplier) { - return null; - } -} diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/impl/R2dbcQueryDefinition.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/impl/R2dbcQueryDefinition.java deleted file mode 100644 index 01c4fde..0000000 --- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/impl/R2dbcQueryDefinition.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.flyfish.framework.r2dbc.query.impl; - -import com.flyfish.framework.query.QueryDefinition; -import com.flyfish.framework.query.QueryMutation; -import org.springframework.data.relational.core.query.Criteria; -import org.springframework.data.util.CastUtils; - -/** - * mongo的查询定义 - * - * @author wangyu - */ -public class R2dbcQueryDefinition implements QueryDefinition { - - private Criteria criteria; - - /** - * 构建 - * - * @return 构建结果 - */ - @Override - public T build() { - return CastUtils.cast(criteria); - } - - /** - * 修改，此修改会直接接着查询条件进行拼接 - * - * @return 修改句柄 - */ - @Override - public QueryMutation mutate() { - return null; - } - - /** - * 会直接添加嵌套查询到当前查询末尾 - * - * @return 修改句柄 - */ - @Override - public QueryMutation within() { - return null; - } - - /** - * 判断查询条件是否为空 - * - * @return 结果 - */ - @Override - public boolean isEmpty() { - return false; - } -} diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/repository/impl/DefaultReactiveRepositoryImpl.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/repository/impl/DefaultReactiveRepositoryImpl.java index 5077493..fdddd83 100644 --- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/repository/impl/DefaultReactiveRepositoryImpl.java +++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/repository/impl/DefaultReactiveRepositoryImpl.java @@ -2,7 +2,6 @@ package com.flyfish.framework.r2dbc.repository.impl; import com.flyfish.framework.domain.base.Domain; import com.flyfish.framework.domain.base.Qo; -import com.flyfish.framework.r2dbc.query.converter.R2dbcQueryConverter; import com.flyfish.framework.repository.DefaultReactiveRepository; import lombok.Getter; import org.apache.commons.lang3.StringUtils; @@ -17,7 +16,6 @@ import org.springframework.data.r2dbc.repository.support.SimpleR2dbcRepository; import org.springframework.data.relational.core.query.Criteria; import org.springframework.data.relational.core.query.Query; import org.springframework.data.relational.repository.query.RelationalEntityInformation; -import org.springframework.data.relational.repository.query.RelationalExampleMapper; import org.springframework.data.repository.core.EntityInformation; import org.springframework.lang.NonNull; import org.springframework.util.Assert; @@ -51,7 +49,6 @@ public class DefaultReactiveRepositoryImpl extends SimpleR2dbc super(entity, entityOperations, converter); this.entity = entity; this.entityOperations = entityOperations; - R2dbcQueryConverter.setExampleMapper(new RelationalExampleMapper(converter.getMappingContext())); } diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/resources/META-INF/spring.factories b/flyfish-data/flyfish-data-r2dbc/src/main/resources/META-INF/spring.factories index aee2084..815b156 100644 --- a/flyfish-data/flyfish-data-r2dbc/src/main/resources/META-INF/spring.factories +++ b/flyfish-data/flyfish-data-r2dbc/src/main/resources/META-INF/spring.factories @@ -1,9 +1,4 @@ -com.flyfish.framework.query.spi.QueryChainFactory=\ - com.flyfish.framework.r2dbc.query.factory.R2dbcLambdaQueryFactory,\ - com.flyfish.framework.r2dbc.query.factory.R2dbcNamedQueryFactory - -com.flyfish.framework.query.spi.converter.QueryConverter=\ - com.flyfish.framework.r2dbc.query.converter.R2dbcQueryConverter - +com.flyfish.framework.query.spi.QueryFactory=\ + com.flyfish.framework.r2dbc.query.R2dbcQueryFactory org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ com.flyfish.framework.r2dbc.config.R2dbcDataConfig