diff --git a/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/MPJMappingApply.java b/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/Apply.java
similarity index 90%
rename from mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/MPJMappingApply.java
rename to mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/Apply.java
index ded2e61..c8eeaca 100644
--- a/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/MPJMappingApply.java
+++ b/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/Apply.java
@@ -8,7 +8,7 @@ package com.github.yulichang.annotation;
* @since 1.2.0
*/
@SuppressWarnings("unused")
-public @interface MPJMappingApply {
+public @interface Apply {
/**
* sql片段
diff --git a/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/MPJMappingCondition.java b/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/Condition.java
similarity index 93%
rename from mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/MPJMappingCondition.java
rename to mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/Condition.java
index 01b60c8..4802194 100644
--- a/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/MPJMappingCondition.java
+++ b/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/Condition.java
@@ -10,7 +10,7 @@ import com.github.yulichang.annotation.enums.SqlKeyword;
* @since 1.2.0
*/
@SuppressWarnings("unused")
-public @interface MPJMappingCondition {
+public @interface Condition {
/**
* 条件枚举
diff --git a/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/EntityMapping.java b/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/EntityMapping.java
index c7804b9..fa47e6b 100644
--- a/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/EntityMapping.java
+++ b/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/EntityMapping.java
@@ -57,12 +57,12 @@ public @interface EntityMapping {
* 映射表查询条件之 apply
* 等效于 Wrappers.query().apply(xxx);
*/
- MPJMappingApply[] apply() default {};
+ Apply[] apply() default {};
/**
* 映射表查询条件
*/
- MPJMappingCondition[] condition() default {};
+ Condition[] condition() default {};
/**
* 映射表查询条件之 orderBy
diff --git a/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/FieldMapping.java b/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/FieldMapping.java
index ae16709..3ae7f4e 100644
--- a/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/FieldMapping.java
+++ b/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/FieldMapping.java
@@ -55,12 +55,12 @@ public @interface FieldMapping {
* 映射表查询条件之 apply
* 等效于 Wrappers.query().apply(xxx);
*/
- MPJMappingApply[] apply() default {};
+ Apply[] apply() default {};
/**
* 映射表查询条件
*/
- MPJMappingCondition[] condition() default {};
+ Condition[] condition() default {};
/**
* 映射表查询条件之 orderBy
diff --git a/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJMappingWrapper.java b/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJMappingWrapper.java
index f1bb758..82afad8 100644
--- a/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJMappingWrapper.java
+++ b/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJMappingWrapper.java
@@ -4,8 +4,6 @@ package com.github.yulichang.extension.mapping.mapper;
import com.baomidou.mybatisplus.core.enums.SqlKeyword;
import com.baomidou.mybatisplus.core.toolkit.StringPool;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.github.yulichang.annotation.MPJMappingApply;
-import com.github.yulichang.annotation.MPJMappingCondition;
import lombok.AllArgsConstructor;
import lombok.Getter;
@@ -44,8 +42,8 @@ public class MPJMappingWrapper {
private final boolean hasOrderByDesc;
private List orderByDesc;
- public MPJMappingWrapper(String first, String select, MPJMappingApply[] applys,
- MPJMappingCondition[] conditions, String last, String orderByAsc, String orderByDesc) {
+ public MPJMappingWrapper(String first, String select, com.github.yulichang.annotation.Apply[] applys,
+ com.github.yulichang.annotation.Condition[] conditions, String last, String orderByAsc, String orderByDesc) {
this.hasFirst = StringUtils.isNotBlank(first);
if (this.hasFirst) {
this.first = first;
@@ -59,7 +57,7 @@ public class MPJMappingWrapper {
this.hasApply = applys.length > 0;
if (this.hasApply) {
this.applyList = new ArrayList<>();
- for (MPJMappingApply apply : applys) {
+ for (com.github.yulichang.annotation.Apply apply : applys) {
this.applyList.add(new Apply(apply.value(), apply.args()));
}
}
@@ -67,7 +65,7 @@ public class MPJMappingWrapper {
this.hasCondition = conditions.length > 0;
if (this.hasCondition) {
this.conditionList = new ArrayList<>();
- for (MPJMappingCondition condition : conditions) {
+ for (com.github.yulichang.annotation.Condition condition : conditions) {
conditionList.add(new Condition(convert(condition.keyWord()), condition.column(), condition.value()));
}
}