From c303ab39499547fc8a5538b48fc9e23dc1880535 Mon Sep 17 00:00:00 2001 From: "tao.chen1" Date: Thu, 6 Jul 2023 16:36:18 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=86=85=E5=A4=96@Entity=E6=97=A0=E6=B3=95=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E7=9A=84=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dorive-api/pom.xml | 2 +- .../java/com/gitee/dorive/api/entity/element/EntityField.java | 2 +- dorive-coating/pom.xml | 2 +- dorive-core/pom.xml | 2 +- dorive-event/pom.xml | 2 +- dorive-injection/pom.xml | 2 +- dorive-proxy/pom.xml | 2 +- dorive-ref/pom.xml | 2 +- dorive-spring-boot-starter/pom.xml | 2 +- pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dorive-api/pom.xml b/dorive-api/pom.xml index 1e1d6087..5398b8a9 100644 --- a/dorive-api/pom.xml +++ b/dorive-api/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.3.9 + 3.4.0 dorive-api diff --git a/dorive-api/src/main/java/com/gitee/dorive/api/entity/element/EntityField.java b/dorive-api/src/main/java/com/gitee/dorive/api/entity/element/EntityField.java index c5cdee3c..5ee1fee0 100644 --- a/dorive-api/src/main/java/com/gitee/dorive/api/entity/element/EntityField.java +++ b/dorive-api/src/main/java/com/gitee/dorive/api/entity/element/EntityField.java @@ -64,7 +64,7 @@ public class EntityField extends EntityEle { private void resolve(Field field) { EntityDef entityDef = getEntityDef(); - if (entityDef != null && type != genericType) { + if (entityDef != null) { EntityDef genericEntityDef = EntityDef.fromElement(genericType); if (genericEntityDef != null) { entityDef.merge(genericEntityDef); diff --git a/dorive-coating/pom.xml b/dorive-coating/pom.xml index 93fa6cde..9ec8c51b 100644 --- a/dorive-coating/pom.xml +++ b/dorive-coating/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.3.9 + 3.4.0 dorive-coating diff --git a/dorive-core/pom.xml b/dorive-core/pom.xml index 19353ff2..ffc3bce3 100644 --- a/dorive-core/pom.xml +++ b/dorive-core/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.3.9 + 3.4.0 dorive-core diff --git a/dorive-event/pom.xml b/dorive-event/pom.xml index eb7dde78..b903bd2c 100644 --- a/dorive-event/pom.xml +++ b/dorive-event/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.3.9 + 3.4.0 dorive-event diff --git a/dorive-injection/pom.xml b/dorive-injection/pom.xml index 20aaf2a8..f35cc0c2 100644 --- a/dorive-injection/pom.xml +++ b/dorive-injection/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.3.9 + 3.4.0 dorive-injection diff --git a/dorive-proxy/pom.xml b/dorive-proxy/pom.xml index 01c8a320..1cf241f8 100644 --- a/dorive-proxy/pom.xml +++ b/dorive-proxy/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.3.9 + 3.4.0 dorive-proxy diff --git a/dorive-ref/pom.xml b/dorive-ref/pom.xml index 8de9b58a..d62cd097 100644 --- a/dorive-ref/pom.xml +++ b/dorive-ref/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.3.9 + 3.4.0 dorive-ref diff --git a/dorive-spring-boot-starter/pom.xml b/dorive-spring-boot-starter/pom.xml index 75832e37..8a5cd84a 100644 --- a/dorive-spring-boot-starter/pom.xml +++ b/dorive-spring-boot-starter/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.3.9 + 3.4.0 dorive-spring-boot-starter diff --git a/pom.xml b/pom.xml index 8ed72e3f..62607236 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.gitee.digital-engine dorive - 3.3.9 + 3.4.0 pom -- Gitee From c7f81e043d9778e4b88f7cc6664487f503841636 Mon Sep 17 00:00:00 2001 From: "tao.chen1" Date: Wed, 12 Jul 2023 14:15:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dorive-api/pom.xml | 2 +- dorive-coating/pom.xml | 2 +- dorive-core/pom.xml | 2 +- .../dorive/core/impl/executor/ChainExecutor.java | 14 +++++++------- dorive-event/pom.xml | 2 +- dorive-injection/pom.xml | 2 +- dorive-proxy/pom.xml | 2 +- dorive-ref/pom.xml | 2 +- dorive-spring-boot-starter/pom.xml | 2 +- pom.xml | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dorive-api/pom.xml b/dorive-api/pom.xml index 5398b8a9..a47a125a 100644 --- a/dorive-api/pom.xml +++ b/dorive-api/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.4.0 + 3.4.1 dorive-api diff --git a/dorive-coating/pom.xml b/dorive-coating/pom.xml index 9ec8c51b..173c2cca 100644 --- a/dorive-coating/pom.xml +++ b/dorive-coating/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.4.0 + 3.4.1 dorive-coating diff --git a/dorive-core/pom.xml b/dorive-core/pom.xml index ffc3bce3..300a5a66 100644 --- a/dorive-core/pom.xml +++ b/dorive-core/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.4.0 + 3.4.1 dorive-core diff --git a/dorive-core/src/main/java/com/gitee/dorive/core/impl/executor/ChainExecutor.java b/dorive-core/src/main/java/com/gitee/dorive/core/impl/executor/ChainExecutor.java index 1da151c3..b3ed67d9 100644 --- a/dorive-core/src/main/java/com/gitee/dorive/core/impl/executor/ChainExecutor.java +++ b/dorive-core/src/main/java/com/gitee/dorive/core/impl/executor/ChainExecutor.java @@ -59,7 +59,7 @@ public class ChainExecutor extends AbstractExecutor implements EntityHandler { Selector selector = context.getSelector(); boolean isIncludeRoot = (query.getType() & OperationType.INCLUDE_ROOT) == OperationType.INCLUDE_ROOT; CommonRepository repository = this.repository.getRootRepository(); - + if (selector.matches(context, repository) || isIncludeRoot) { Result result = repository.executeQuery(context, query); List entities = result.getRecords(); @@ -95,7 +95,7 @@ public class ChainExecutor extends AbstractExecutor implements EntityHandler { int expectedIgnoreRoot = realExpectedType | OperationType.IGNORE_ROOT; Object rootEntity = operation.getEntity(); - Assert.notNull(rootEntity, "The rootEntity cannot be null!"); + Assert.notNull(rootEntity, "The root entity cannot be null!"); DerivedResolver derivedResolver = repository.getDerivedResolver(); AbstractContextRepository delegateRepository = derivedResolver.deriveRepository(rootEntity); @@ -128,14 +128,14 @@ public class ChainExecutor extends AbstractExecutor implements EntityHandler { int operationType = OperationType.NONE; boolean operable = false; if (isMatch) { - operationType = mergeOperationType(realExpectedType, repository, entity); + operationType = determineOperationType(expectedType, realExpectedType, repository, entity); operable = (operationType & OperationType.INSERT_OR_UPDATE_OR_DELETE) > 0; if ((operationType & OperationType.INSERT) == OperationType.INSERT) { getBoundValue(repository, context, rootEntity, entity); } } if (isAggregated) { - Operation newOperation = newOperation(realExpectedType, repository, context, entity); + Operation newOperation = newOperation(realExpectedType, repository, entity); newOperation.setType(operable ? expectedIncludeRoot : expectedIgnoreRoot); totalCount += repository.execute(context, newOperation); @@ -155,8 +155,8 @@ public class ChainExecutor extends AbstractExecutor implements EntityHandler { return totalCount; } - private int mergeOperationType(int realExpectedType, CommonRepository repository, Object entity) { - if (realExpectedType == OperationType.FORCE_INSERT) { + private int determineOperationType(int expectedType, int realExpectedType, CommonRepository repository, Object entity) { + if (expectedType == OperationType.FORCE_INSERT) { return OperationType.INSERT; } else { Object primaryKey = repository.getPrimaryKey(entity); @@ -165,7 +165,7 @@ public class ChainExecutor extends AbstractExecutor implements EntityHandler { } } - private Operation newOperation(int realExpectedType, CommonRepository repository, Context context, Object entity) { + private Operation newOperation(int realExpectedType, CommonRepository repository, Object entity) { OperationFactory operationFactory = repository.getOperationFactory(); if (realExpectedType == OperationType.INSERT) { return operationFactory.buildInsert(entity); diff --git a/dorive-event/pom.xml b/dorive-event/pom.xml index b903bd2c..2cfb0c52 100644 --- a/dorive-event/pom.xml +++ b/dorive-event/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.4.0 + 3.4.1 dorive-event diff --git a/dorive-injection/pom.xml b/dorive-injection/pom.xml index f35cc0c2..770c8855 100644 --- a/dorive-injection/pom.xml +++ b/dorive-injection/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.4.0 + 3.4.1 dorive-injection diff --git a/dorive-proxy/pom.xml b/dorive-proxy/pom.xml index 1cf241f8..47b12cde 100644 --- a/dorive-proxy/pom.xml +++ b/dorive-proxy/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.4.0 + 3.4.1 dorive-proxy diff --git a/dorive-ref/pom.xml b/dorive-ref/pom.xml index d62cd097..125f2b0f 100644 --- a/dorive-ref/pom.xml +++ b/dorive-ref/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.4.0 + 3.4.1 dorive-ref diff --git a/dorive-spring-boot-starter/pom.xml b/dorive-spring-boot-starter/pom.xml index 8a5cd84a..dfff5487 100644 --- a/dorive-spring-boot-starter/pom.xml +++ b/dorive-spring-boot-starter/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.4.0 + 3.4.1 dorive-spring-boot-starter diff --git a/pom.xml b/pom.xml index 62607236..c89871ad 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.gitee.digital-engine dorive - 3.4.0 + 3.4.1 pom -- Gitee From 95995353211a77c39187619f7ea1ed979615087b Mon Sep 17 00:00:00 2001 From: "tao.chen1" Date: Thu, 13 Jul 2023 15:42:20 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=85=81=E8=AE=B8context=20put=20null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dorive-api/pom.xml | 2 +- dorive-coating/pom.xml | 2 +- dorive-core/pom.xml | 2 +- .../com/gitee/dorive/core/entity/context/AbstractContext.java | 4 ++-- dorive-event/pom.xml | 2 +- dorive-injection/pom.xml | 2 +- dorive-proxy/pom.xml | 2 +- dorive-ref/pom.xml | 2 +- dorive-spring-boot-starter/pom.xml | 2 +- pom.xml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dorive-api/pom.xml b/dorive-api/pom.xml index a47a125a..9e38d8c6 100644 --- a/dorive-api/pom.xml +++ b/dorive-api/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.4.1 + 3.4.2 dorive-api diff --git a/dorive-coating/pom.xml b/dorive-coating/pom.xml index 173c2cca..e5f54ec3 100644 --- a/dorive-coating/pom.xml +++ b/dorive-coating/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.4.1 + 3.4.2 dorive-coating diff --git a/dorive-core/pom.xml b/dorive-core/pom.xml index 300a5a66..c0bde56d 100644 --- a/dorive-core/pom.xml +++ b/dorive-core/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.4.1 + 3.4.2 dorive-core diff --git a/dorive-core/src/main/java/com/gitee/dorive/core/entity/context/AbstractContext.java b/dorive-core/src/main/java/com/gitee/dorive/core/entity/context/AbstractContext.java index 392bd829..9bb4ee18 100644 --- a/dorive-core/src/main/java/com/gitee/dorive/core/entity/context/AbstractContext.java +++ b/dorive-core/src/main/java/com/gitee/dorive/core/entity/context/AbstractContext.java @@ -24,8 +24,8 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.util.Collections; +import java.util.LinkedHashMap; import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; @Data @NoArgsConstructor @@ -40,7 +40,7 @@ public abstract class AbstractContext implements Context { public Object put(String key, Object value) { if (attachments == Collections.EMPTY_MAP) { - attachments = new ConcurrentHashMap<>(); + attachments = new LinkedHashMap<>(); } return attachments.put(key, value); } diff --git a/dorive-event/pom.xml b/dorive-event/pom.xml index 2cfb0c52..a295ba10 100644 --- a/dorive-event/pom.xml +++ b/dorive-event/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.4.1 + 3.4.2 dorive-event diff --git a/dorive-injection/pom.xml b/dorive-injection/pom.xml index 770c8855..2cb9b5b9 100644 --- a/dorive-injection/pom.xml +++ b/dorive-injection/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.4.1 + 3.4.2 dorive-injection diff --git a/dorive-proxy/pom.xml b/dorive-proxy/pom.xml index 47b12cde..dc7e0691 100644 --- a/dorive-proxy/pom.xml +++ b/dorive-proxy/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.4.1 + 3.4.2 dorive-proxy diff --git a/dorive-ref/pom.xml b/dorive-ref/pom.xml index 125f2b0f..b6ef802e 100644 --- a/dorive-ref/pom.xml +++ b/dorive-ref/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.4.1 + 3.4.2 dorive-ref diff --git a/dorive-spring-boot-starter/pom.xml b/dorive-spring-boot-starter/pom.xml index dfff5487..ea9ebe91 100644 --- a/dorive-spring-boot-starter/pom.xml +++ b/dorive-spring-boot-starter/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.4.1 + 3.4.2 dorive-spring-boot-starter diff --git a/pom.xml b/pom.xml index c89871ad..49e30309 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.gitee.digital-engine dorive - 3.4.1 + 3.4.2 pom -- Gitee From 30b9121c8c4e31199dbf2a02dfe37013767ca5b9 Mon Sep 17 00:00:00 2001 From: "tao.chen1" Date: Wed, 19 Jul 2023 10:57:51 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c7b3f01e..5a457330 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ stars

-🔥🔥🔥dorive轻量级领域驱动框架，帮助开发者通过建模，快速构建具有可维护性、可拓展性的应用程序。 +🔥🔥🔥轻量的级领域驱动式ORM框架，帮助开发者通过建模，快速构建具有可维护性、可拓展性的应用程序。 ### 👍推荐理由 -- Gitee