From eb58a2987fd755bf691eae235a80396d76f1d546 Mon Sep 17 00:00:00 2001 From: yulichang <570810310@qq.com> Date: Fri, 19 Nov 2021 09:22:33 +0800 Subject: [PATCH] code style --- .../com/github/yulichang/query/MPJQueryWrapper.java | 6 ++++-- .../toolkit/{Wrappers.java => MPJWrappers.java} | 6 +++--- .../yulichang/wrapper/MPJJoinLambdaQueryWrapper.java | 2 +- .../github/yulichang/wrapper/MPJLambdaWrapper.java | 11 ++++++----- 4 files changed, 14 insertions(+), 11 deletions(-) rename src/main/java/com/github/yulichang/toolkit/{Wrappers.java => MPJWrappers.java} (81%) diff --git a/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java b/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java index 23228e3..a4294d1 100644 --- a/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java +++ b/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java @@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.github.yulichang.query.interfaces.MPJJoin; import com.github.yulichang.toolkit.Constant; +import com.github.yulichang.toolkit.MPJWrappers; import org.springframework.util.Assert; import java.util.ArrayList; @@ -25,10 +26,10 @@ import java.util.stream.Collectors; /** * copy {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper} - * 推荐使用 Wrappers.queryJoin();构造 + * 推荐使用 MPJWrappers.queryJoin();构造 * * @author yulichang - * @see com.github.yulichang.toolkit.Wrappers + * @see MPJWrappers */ @SuppressWarnings("unused") public class MPJQueryWrapper extends AbstractWrapper> @@ -177,6 +178,7 @@ public class MPJQueryWrapper extends AbstractWrapper lambda() { return new MPJLambdaQueryWrapper<>(getEntity(), getEntityClass(), from, sqlSelect, paramNameSeq, paramNameValuePairs, expression, lastSql, sqlComment, sqlFirst, selectColumns, ignoreColumns); diff --git a/src/main/java/com/github/yulichang/toolkit/Wrappers.java b/src/main/java/com/github/yulichang/toolkit/MPJWrappers.java similarity index 81% rename from src/main/java/com/github/yulichang/toolkit/Wrappers.java rename to src/main/java/com/github/yulichang/toolkit/MPJWrappers.java index fd9892a..4ca7845 100644 --- a/src/main/java/com/github/yulichang/toolkit/Wrappers.java +++ b/src/main/java/com/github/yulichang/toolkit/MPJWrappers.java @@ -9,17 +9,17 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper; * @author yulichang */ @SuppressWarnings("unused") -public class Wrappers { +public class MPJWrappers { /** - * Wrappers.queryJoin() + * MPJWrappers.queryJoin() */ public static MPJQueryWrapper queryJoin() { return new MPJQueryWrapper<>(); } /** - * Wrappers.lambdaJoin() + * MPJWrappers.lambdaJoin() */ public static MPJLambdaWrapper lambdaJoin() { return new MPJLambdaWrapper<>(); diff --git a/src/main/java/com/github/yulichang/wrapper/MPJJoinLambdaQueryWrapper.java b/src/main/java/com/github/yulichang/wrapper/MPJJoinLambdaQueryWrapper.java index 70b4236..12c64b4 100644 --- a/src/main/java/com/github/yulichang/wrapper/MPJJoinLambdaQueryWrapper.java +++ b/src/main/java/com/github/yulichang/wrapper/MPJJoinLambdaQueryWrapper.java @@ -3,7 +3,7 @@ package com.github.yulichang.wrapper; /** * 名字太长 变更为MPJLambdaWrapper * {@link MPJLambdaWrapper} - * 推荐 使用 Wrappers.lambdaJoin(); 构造器 + * 推荐 使用 MPJWrappers.lambdaJoin(); 构造器 * * @author yulichang */ diff --git a/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java b/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java index d63c9dc..304e6b5 100644 --- a/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java +++ b/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.toolkit.*; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.github.yulichang.toolkit.Constant; import com.github.yulichang.toolkit.LambdaUtils; +import com.github.yulichang.toolkit.MPJWrappers; import com.github.yulichang.wrapper.enums.BaseFuncEnum; import com.github.yulichang.wrapper.interfaces.LambdaJoin; import com.github.yulichang.wrapper.interfaces.Query; @@ -28,12 +29,12 @@ import java.util.stream.Collectors; * 参考 {@link com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper} * Lambda 语法使用 Wrapper *

- * 推荐使用 Wrappers.lambdaJoin();构造 + * 推荐使用 MPJWrappers.lambdaJoin();构造 * * @author yulichang - * @see com.github.yulichang.toolkit.Wrappers + * @see MPJWrappers */ -@SuppressWarnings("all") +@SuppressWarnings("unused") public class MPJLambdaWrapper extends MPJAbstractLambdaWrapper> implements Query>, LambdaJoin> { @@ -85,7 +86,7 @@ public class MPJLambdaWrapper extends MPJAbstractLambdaWrapper joinClass; /** - * 不建议直接 new 该实例,使用 Wrappers.lambdaQuery() + * 不建议直接 new 该实例,使用 MPJWrappers.lambdaQuery() */ public MPJLambdaWrapper() { super.initNeed(); @@ -93,7 +94,7 @@ public class MPJLambdaWrapper extends MPJAbstractLambdaWrapperlambdaQuery() */ MPJLambdaWrapper(T entity, Class entityClass, SharedString sqlSelect, AtomicInteger paramNameSeq, Map paramNameValuePairs, MergeSegments mergeSegments,