diff --git a/README.md b/README.md index f2809d9..099ed0d 100644 --- a/README.md +++ b/README.md @@ -8,16 +8,19 @@ In order to maximize the lightweight nature of the Brook engine, a deliberate se ### Maven dependency -#### Not using Spring - +Specify the version appropriate for the project. ```xml ... +``` + +#### Not using Spring +```xml - org.mytang.brook + xyz.mytang0.brook >brook-engine ${brook.version} @@ -27,13 +30,9 @@ In order to maximize the lightweight nature of the Brook engine, a deliberate se #### Springboot (recommend) ```xml - - ... - - - org.mytang.brook + xyz.mytang0.brook >brook-spring-boot-starter ${brook.version} @@ -46,7 +45,7 @@ For expedited testing. ```shell mvn archetype:generate \ - -DarchetypeGroupId=org.mytang.brook.demo \ + -DarchetypeGroupId=xyz.mytang0.brook.demo \ -DarchetypeArtifactId=brook-demo-spring-archetype \ -DarchetypeVersion=1.0.0-SNAPSHOT \ -DgroupId= \ diff --git a/brook-common/pom.xml b/brook-common/pom.xml index 44c32ae..a27c633 100644 --- a/brook-common/pom.xml +++ b/brook-common/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.mytang.brook + xyz.mytang0.brook brook-parent ${revision} ../pom.xml diff --git a/brook-common/src/main/java/org/mytang/brook/common/annotation/Order.java b/brook-common/src/main/java/xyz/mytang0/brook/common/annotation/Order.java similarity index 89% rename from brook-common/src/main/java/org/mytang/brook/common/annotation/Order.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/annotation/Order.java index 19ff6f6..eb27b25 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/annotation/Order.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/annotation/Order.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.annotation; +package xyz.mytang0.brook.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/brook-common/src/main/java/org/mytang/brook/common/annotation/OrderComparator.java b/brook-common/src/main/java/xyz/mytang0/brook/common/annotation/OrderComparator.java similarity index 92% rename from brook-common/src/main/java/org/mytang/brook/common/annotation/OrderComparator.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/annotation/OrderComparator.java index cd17859..55b2b6d 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/annotation/OrderComparator.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/annotation/OrderComparator.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.annotation; +package xyz.mytang0.brook.common.annotation; import java.util.Comparator; diff --git a/brook-common/src/main/java/org/mytang/brook/common/configuration/ConfigOption.java b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/ConfigOption.java similarity index 98% rename from brook-common/src/main/java/org/mytang/brook/common/configuration/ConfigOption.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/configuration/ConfigOption.java index 446eb54..17be6b7 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/configuration/ConfigOption.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/ConfigOption.java @@ -1,6 +1,6 @@ -package org.mytang.brook.common.configuration; +package xyz.mytang0.brook.common.configuration; -import org.mytang.brook.common.configuration.description.Description; +import xyz.mytang0.brook.common.configuration.description.Description; import java.util.Arrays; import java.util.Collections; diff --git a/brook-common/src/main/java/org/mytang/brook/common/configuration/ConfigOptions.java b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/ConfigOptions.java similarity index 98% rename from brook-common/src/main/java/org/mytang/brook/common/configuration/ConfigOptions.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/configuration/ConfigOptions.java index c6b660e..f3d9b9f 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/configuration/ConfigOptions.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/ConfigOptions.java @@ -1,6 +1,6 @@ -package org.mytang.brook.common.configuration; +package xyz.mytang0.brook.common.configuration; -import org.mytang.brook.common.configuration.description.Description; +import xyz.mytang0.brook.common.configuration.description.Description; import java.time.Duration; import java.util.Arrays; diff --git a/brook-common/src/main/java/org/mytang/brook/common/configuration/Configuration.java b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/Configuration.java similarity index 99% rename from brook-common/src/main/java/org/mytang/brook/common/configuration/Configuration.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/configuration/Configuration.java index 1dcc38c..1f03141 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/configuration/Configuration.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/Configuration.java @@ -1,7 +1,7 @@ -package org.mytang.brook.common.configuration; +package xyz.mytang0.brook.common.configuration; -import org.mytang.brook.common.utils.DurationUtils; -import org.mytang.brook.common.utils.JsonUtils; +import xyz.mytang0.brook.common.utils.DurationUtils; +import xyz.mytang0.brook.common.utils.JsonUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/brook-common/src/main/java/org/mytang/brook/common/configuration/FallbackKey.java b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/FallbackKey.java similarity index 96% rename from brook-common/src/main/java/org/mytang/brook/common/configuration/FallbackKey.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/configuration/FallbackKey.java index 521078b..b39646f 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/configuration/FallbackKey.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/FallbackKey.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.configuration; +package xyz.mytang0.brook.common.configuration; /** * A key with FallbackKeys will fall back to the FallbackKeys if it itself is not configured. diff --git a/brook-common/src/main/java/org/mytang/brook/common/configuration/StructuredOptionsSplitter.java b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/StructuredOptionsSplitter.java similarity index 99% rename from brook-common/src/main/java/org/mytang/brook/common/configuration/StructuredOptionsSplitter.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/configuration/StructuredOptionsSplitter.java index fe7e0a8..735a20c 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/configuration/StructuredOptionsSplitter.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/StructuredOptionsSplitter.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.configuration; +package xyz.mytang0.brook.common.configuration; import java.util.ArrayList; import java.util.Arrays; diff --git a/brook-common/src/main/java/org/mytang/brook/common/configuration/Validatable.java b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/Validatable.java similarity index 52% rename from brook-common/src/main/java/org/mytang/brook/common/configuration/Validatable.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/configuration/Validatable.java index 579ecd2..203d596 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/configuration/Validatable.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/Validatable.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.configuration; +package xyz.mytang0.brook.common.configuration; public interface Validatable { diff --git a/brook-common/src/main/java/org/mytang/brook/common/configuration/description/BlockElement.java b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/BlockElement.java similarity index 71% rename from brook-common/src/main/java/org/mytang/brook/common/configuration/description/BlockElement.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/BlockElement.java index 13e0b5e..af11b45 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/configuration/description/BlockElement.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/BlockElement.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.configuration.description; +package xyz.mytang0.brook.common.configuration.description; /** * Part of description that represents a block e.g. some text, linebreak or a list. diff --git a/brook-common/src/main/java/org/mytang/brook/common/configuration/description/Description.java b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/Description.java similarity index 96% rename from brook-common/src/main/java/org/mytang/brook/common/configuration/description/Description.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/Description.java index b12a137..82f9721 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/configuration/description/Description.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/Description.java @@ -1,6 +1,6 @@ -package org.mytang.brook.common.configuration.description; +package xyz.mytang0.brook.common.configuration.description; -import org.mytang.brook.common.configuration.ConfigOption; +import xyz.mytang0.brook.common.configuration.ConfigOption; import java.util.ArrayList; import java.util.List; diff --git a/brook-common/src/main/java/org/mytang/brook/common/configuration/description/DescriptionElement.java b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/DescriptionElement.java similarity index 83% rename from brook-common/src/main/java/org/mytang/brook/common/configuration/description/DescriptionElement.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/DescriptionElement.java index 5034bb7..7f32b00 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/configuration/description/DescriptionElement.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/DescriptionElement.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.configuration.description; +package xyz.mytang0.brook.common.configuration.description; /** * Part of a {@link Description} that can be converted into String representation. diff --git a/brook-common/src/main/java/org/mytang/brook/common/configuration/description/Formatter.java b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/Formatter.java similarity index 97% rename from brook-common/src/main/java/org/mytang/brook/common/configuration/description/Formatter.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/Formatter.java index 067e23c..3fb89f5 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/configuration/description/Formatter.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/Formatter.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.configuration.description; +package xyz.mytang0.brook.common.configuration.description; import java.util.EnumSet; diff --git a/brook-common/src/main/java/org/mytang/brook/common/configuration/description/HtmlFormatter.java b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/HtmlFormatter.java similarity index 96% rename from brook-common/src/main/java/org/mytang/brook/common/configuration/description/HtmlFormatter.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/HtmlFormatter.java index 59c209d..3a3efbd 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/configuration/description/HtmlFormatter.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/HtmlFormatter.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.configuration.description; +package xyz.mytang0.brook.common.configuration.description; import java.util.EnumSet; diff --git a/brook-common/src/main/java/org/mytang/brook/common/configuration/description/InlineElement.java b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/InlineElement.java similarity index 71% rename from brook-common/src/main/java/org/mytang/brook/common/configuration/description/InlineElement.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/InlineElement.java index fd161a6..5dd1aad 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/configuration/description/InlineElement.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/InlineElement.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.configuration.description; +package xyz.mytang0.brook.common.configuration.description; /** * Part of description that represents an element inside a block e.g. a link. diff --git a/brook-common/src/main/java/org/mytang/brook/common/configuration/description/LineBreakElement.java b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/LineBreakElement.java similarity index 87% rename from brook-common/src/main/java/org/mytang/brook/common/configuration/description/LineBreakElement.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/LineBreakElement.java index 325bf40..e9e0dbd 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/configuration/description/LineBreakElement.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/LineBreakElement.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.configuration.description; +package xyz.mytang0.brook.common.configuration.description; /** * Represents a line break in the {@link Description}. diff --git a/brook-common/src/main/java/org/mytang/brook/common/configuration/description/LinkElement.java b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/LinkElement.java similarity index 95% rename from brook-common/src/main/java/org/mytang/brook/common/configuration/description/LinkElement.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/LinkElement.java index 88444be..e808299 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/configuration/description/LinkElement.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/LinkElement.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.configuration.description; +package xyz.mytang0.brook.common.configuration.description; /** * Element that represents a link in the {@link Description}. diff --git a/brook-common/src/main/java/org/mytang/brook/common/configuration/description/ListElement.java b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/ListElement.java similarity index 94% rename from brook-common/src/main/java/org/mytang/brook/common/configuration/description/ListElement.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/ListElement.java index 4e687c2..63a5945 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/configuration/description/ListElement.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/ListElement.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.configuration.description; +package xyz.mytang0.brook.common.configuration.description; import java.util.Arrays; import java.util.List; diff --git a/brook-common/src/main/java/org/mytang/brook/common/configuration/description/TextElement.java b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/TextElement.java similarity index 97% rename from brook-common/src/main/java/org/mytang/brook/common/configuration/description/TextElement.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/TextElement.java index 97789a5..3ac800d 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/configuration/description/TextElement.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/description/TextElement.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.configuration.description; +package xyz.mytang0.brook.common.configuration.description; import java.util.Arrays; import java.util.Collections; diff --git a/brook-common/src/main/java/org/mytang/brook/common/constants/Delimiter.java b/brook-common/src/main/java/xyz/mytang0/brook/common/constants/Delimiter.java similarity index 92% rename from brook-common/src/main/java/org/mytang/brook/common/constants/Delimiter.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/constants/Delimiter.java index 1694ac6..a338782 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/constants/Delimiter.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/constants/Delimiter.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.constants; +package xyz.mytang0.brook.common.constants; public interface Delimiter { diff --git a/brook-common/src/main/java/org/mytang/brook/common/constants/QueueConstants.java b/brook-common/src/main/java/xyz/mytang0/brook/common/constants/QueueConstants.java similarity index 62% rename from brook-common/src/main/java/org/mytang/brook/common/constants/QueueConstants.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/constants/QueueConstants.java index 7d768dc..79555bf 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/constants/QueueConstants.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/constants/QueueConstants.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.constants; +package xyz.mytang0.brook.common.constants; public interface QueueConstants { diff --git a/brook-common/src/main/java/org/mytang/brook/common/context/FlowContext.java b/brook-common/src/main/java/xyz/mytang0/brook/common/context/FlowContext.java similarity index 80% rename from brook-common/src/main/java/org/mytang/brook/common/context/FlowContext.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/context/FlowContext.java index f732499..8af0e5d 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/context/FlowContext.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/context/FlowContext.java @@ -1,9 +1,9 @@ -package org.mytang.brook.common.context; +package xyz.mytang0.brook.common.context; -import org.mytang.brook.common.holder.UserHolder; -import org.mytang.brook.common.metadata.instance.FlowInstance; -import org.mytang.brook.common.metadata.instance.TaskInstance; -import org.mytang.brook.common.metadata.model.User; +import xyz.mytang0.brook.common.holder.UserHolder; +import xyz.mytang0.brook.common.metadata.instance.FlowInstance; +import xyz.mytang0.brook.common.metadata.instance.TaskInstance; +import xyz.mytang0.brook.common.metadata.model.User; import java.util.Objects; diff --git a/brook-common/src/main/java/org/mytang/brook/common/context/TaskMapperContext.java b/brook-common/src/main/java/xyz/mytang0/brook/common/context/TaskMapperContext.java similarity index 76% rename from brook-common/src/main/java/org/mytang/brook/common/context/TaskMapperContext.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/context/TaskMapperContext.java index 33fe002..de9eff6 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/context/TaskMapperContext.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/context/TaskMapperContext.java @@ -1,8 +1,8 @@ -package org.mytang.brook.common.context; +package xyz.mytang0.brook.common.context; -import org.mytang.brook.common.configuration.Configuration; -import org.mytang.brook.common.metadata.definition.TaskDef; -import org.mytang.brook.common.metadata.instance.FlowInstance; +import xyz.mytang0.brook.common.configuration.Configuration; +import xyz.mytang0.brook.common.metadata.definition.TaskDef; +import xyz.mytang0.brook.common.metadata.instance.FlowInstance; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/brook-common/src/main/java/org/mytang/brook/common/exception/BizException.java b/brook-common/src/main/java/xyz/mytang0/brook/common/exception/BizException.java similarity index 96% rename from brook-common/src/main/java/org/mytang/brook/common/exception/BizException.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/exception/BizException.java index a562db3..8fd61a1 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/exception/BizException.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/exception/BizException.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.exception; +package xyz.mytang0.brook.common.exception; public class BizException extends RuntimeException { diff --git a/brook-common/src/main/java/org/mytang/brook/common/exception/ErrorCode.java b/brook-common/src/main/java/xyz/mytang0/brook/common/exception/ErrorCode.java similarity index 96% rename from brook-common/src/main/java/org/mytang/brook/common/exception/ErrorCode.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/exception/ErrorCode.java index 92db402..ffe90ec 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/exception/ErrorCode.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/exception/ErrorCode.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.exception; +package xyz.mytang0.brook.common.exception; import java.util.Objects; diff --git a/brook-common/src/main/java/org/mytang/brook/common/exception/ErrorCodeSupplier.java b/brook-common/src/main/java/xyz/mytang0/brook/common/exception/ErrorCodeSupplier.java similarity index 61% rename from brook-common/src/main/java/org/mytang/brook/common/exception/ErrorCodeSupplier.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/exception/ErrorCodeSupplier.java index 881178c..908e1ea 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/exception/ErrorCodeSupplier.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/exception/ErrorCodeSupplier.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.exception; +package xyz.mytang0.brook.common.exception; public interface ErrorCodeSupplier { diff --git a/brook-common/src/main/java/org/mytang/brook/common/exception/ErrorType.java b/brook-common/src/main/java/xyz/mytang0/brook/common/exception/ErrorType.java similarity index 60% rename from brook-common/src/main/java/org/mytang/brook/common/exception/ErrorType.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/exception/ErrorType.java index 7a36e88..3eb228d 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/exception/ErrorType.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/exception/ErrorType.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.exception; +package xyz.mytang0.brook.common.exception; public enum ErrorType { diff --git a/brook-common/src/main/java/org/mytang/brook/common/extension/DisableInject.java b/brook-common/src/main/java/xyz/mytang0/brook/common/extension/DisableInject.java similarity index 88% rename from brook-common/src/main/java/org/mytang/brook/common/extension/DisableInject.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/extension/DisableInject.java index 3b22ad7..1f355b4 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/extension/DisableInject.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/extension/DisableInject.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.extension; +package xyz.mytang0.brook.common.extension; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/brook-common/src/main/java/org/mytang/brook/common/extension/Disposable.java b/brook-common/src/main/java/xyz/mytang0/brook/common/extension/Disposable.java similarity index 55% rename from brook-common/src/main/java/org/mytang/brook/common/extension/Disposable.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/extension/Disposable.java index 4128930..3453a69 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/extension/Disposable.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/extension/Disposable.java @@ -1,5 +1,5 @@ -package org.mytang.brook.common.extension; +package xyz.mytang0.brook.common.extension; public interface Disposable { diff --git a/brook-common/src/main/java/org/mytang/brook/common/extension/ExtensionDirector.java b/brook-common/src/main/java/xyz/mytang0/brook/common/extension/ExtensionDirector.java similarity index 98% rename from brook-common/src/main/java/org/mytang/brook/common/extension/ExtensionDirector.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/extension/ExtensionDirector.java index 76ecaf9..ccbe8d1 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/extension/ExtensionDirector.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/extension/ExtensionDirector.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.extension; +package xyz.mytang0.brook.common.extension; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; diff --git a/brook-common/src/main/java/org/mytang/brook/common/extension/ExtensionLoader.java b/brook-common/src/main/java/xyz/mytang0/brook/common/extension/ExtensionLoader.java similarity index 97% rename from brook-common/src/main/java/org/mytang/brook/common/extension/ExtensionLoader.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/extension/ExtensionLoader.java index 8b6a32d..a1daafe 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/extension/ExtensionLoader.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/extension/ExtensionLoader.java @@ -1,11 +1,11 @@ -package org.mytang.brook.common.extension; - -import org.mytang.brook.common.annotation.OrderComparator; -import org.mytang.brook.common.extension.injector.ExtensionInjector; -import org.mytang.brook.common.extension.loading.LoadingStrategy; -import org.mytang.brook.common.utils.Holder; -import org.mytang.brook.common.utils.ReflectUtils; -import org.mytang.brook.common.utils.StringUtils; +package xyz.mytang0.brook.common.extension; + +import xyz.mytang0.brook.common.annotation.OrderComparator; +import xyz.mytang0.brook.common.extension.injector.ExtensionInjector; +import xyz.mytang0.brook.common.extension.loading.LoadingStrategy; +import xyz.mytang0.brook.common.utils.Holder; +import xyz.mytang0.brook.common.utils.ReflectUtils; +import xyz.mytang0.brook.common.utils.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/brook-common/src/main/java/org/mytang/brook/common/extension/SPI.java b/brook-common/src/main/java/xyz/mytang0/brook/common/extension/SPI.java similarity index 88% rename from brook-common/src/main/java/org/mytang/brook/common/extension/SPI.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/extension/SPI.java index 1b24066..ab0f7b8 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/extension/SPI.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/extension/SPI.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.extension; +package xyz.mytang0.brook.common.extension; import java.lang.annotation.Documented; diff --git a/brook-common/src/main/java/org/mytang/brook/common/extension/Selected.java b/brook-common/src/main/java/xyz/mytang0/brook/common/extension/Selected.java similarity index 89% rename from brook-common/src/main/java/org/mytang/brook/common/extension/Selected.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/extension/Selected.java index 8324999..b28b67c 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/extension/Selected.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/extension/Selected.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.extension; +package xyz.mytang0.brook.common.extension; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/brook-common/src/main/java/org/mytang/brook/common/extension/injector/ExtensionInjector.java b/brook-common/src/main/java/xyz/mytang0/brook/common/extension/injector/ExtensionInjector.java similarity index 52% rename from brook-common/src/main/java/org/mytang/brook/common/extension/injector/ExtensionInjector.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/extension/injector/ExtensionInjector.java index cf2d91a..672df7d 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/extension/injector/ExtensionInjector.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/extension/injector/ExtensionInjector.java @@ -1,6 +1,6 @@ -package org.mytang.brook.common.extension.injector; +package xyz.mytang0.brook.common.extension.injector; -import org.mytang.brook.common.extension.SPI; +import xyz.mytang0.brook.common.extension.SPI; @SPI public interface ExtensionInjector { diff --git a/brook-common/src/main/java/org/mytang/brook/common/extension/injector/SpiExtensionInjector.java b/brook-common/src/main/java/xyz/mytang0/brook/common/extension/injector/SpiExtensionInjector.java similarity index 77% rename from brook-common/src/main/java/org/mytang/brook/common/extension/injector/SpiExtensionInjector.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/extension/injector/SpiExtensionInjector.java index 4523097..e891688 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/extension/injector/SpiExtensionInjector.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/extension/injector/SpiExtensionInjector.java @@ -1,9 +1,9 @@ -package org.mytang.brook.common.extension.injector; +package xyz.mytang0.brook.common.extension.injector; -import org.mytang.brook.common.annotation.Order; -import org.mytang.brook.common.extension.ExtensionLoader; -import org.mytang.brook.common.extension.SPI; +import xyz.mytang0.brook.common.annotation.Order; +import xyz.mytang0.brook.common.extension.ExtensionLoader; +import xyz.mytang0.brook.common.extension.SPI; @Order(1) diff --git a/brook-common/src/main/java/org/mytang/brook/common/extension/loading/DirectoryLoadingStrategy.java b/brook-common/src/main/java/xyz/mytang0/brook/common/extension/loading/DirectoryLoadingStrategy.java similarity index 62% rename from brook-common/src/main/java/org/mytang/brook/common/extension/loading/DirectoryLoadingStrategy.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/extension/loading/DirectoryLoadingStrategy.java index 8dcf65c..86f9f5d 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/extension/loading/DirectoryLoadingStrategy.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/extension/loading/DirectoryLoadingStrategy.java @@ -1,6 +1,6 @@ -package org.mytang.brook.common.extension.loading; +package xyz.mytang0.brook.common.extension.loading; -import org.mytang.brook.common.annotation.Order; +import xyz.mytang0.brook.common.annotation.Order; @Order(0) public class DirectoryLoadingStrategy implements LoadingStrategy { diff --git a/brook-common/src/main/java/org/mytang/brook/common/extension/loading/ExtensionLoadingStrategy.java b/brook-common/src/main/java/xyz/mytang0/brook/common/extension/loading/ExtensionLoadingStrategy.java similarity index 63% rename from brook-common/src/main/java/org/mytang/brook/common/extension/loading/ExtensionLoadingStrategy.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/extension/loading/ExtensionLoadingStrategy.java index e7941d3..406ed97 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/extension/loading/ExtensionLoadingStrategy.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/extension/loading/ExtensionLoadingStrategy.java @@ -1,7 +1,7 @@ -package org.mytang.brook.common.extension.loading; +package xyz.mytang0.brook.common.extension.loading; -import org.mytang.brook.common.annotation.Order; +import xyz.mytang0.brook.common.annotation.Order; @Order public class ExtensionLoadingStrategy implements LoadingStrategy { diff --git a/brook-common/src/main/java/org/mytang/brook/common/extension/loading/LoadingStrategy.java b/brook-common/src/main/java/xyz/mytang0/brook/common/extension/loading/LoadingStrategy.java similarity index 54% rename from brook-common/src/main/java/org/mytang/brook/common/extension/loading/LoadingStrategy.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/extension/loading/LoadingStrategy.java index e590758..a72c925 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/extension/loading/LoadingStrategy.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/extension/loading/LoadingStrategy.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.extension.loading; +package xyz.mytang0.brook.common.extension.loading; public interface LoadingStrategy { diff --git a/brook-common/src/main/java/org/mytang/brook/common/extension/loading/ServiceLoadingStrategy.java b/brook-common/src/main/java/xyz/mytang0/brook/common/extension/loading/ServiceLoadingStrategy.java similarity index 64% rename from brook-common/src/main/java/org/mytang/brook/common/extension/loading/ServiceLoadingStrategy.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/extension/loading/ServiceLoadingStrategy.java index 9c025ae..a55cbe6 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/extension/loading/ServiceLoadingStrategy.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/extension/loading/ServiceLoadingStrategy.java @@ -1,6 +1,6 @@ -package org.mytang.brook.common.extension.loading; +package xyz.mytang0.brook.common.extension.loading; -import org.mytang.brook.common.annotation.Order; +import xyz.mytang0.brook.common.annotation.Order; @Order(Integer.MIN_VALUE) public class ServiceLoadingStrategy implements LoadingStrategy { diff --git a/brook-common/src/main/java/org/mytang/brook/common/holder/UserHolder.java b/brook-common/src/main/java/xyz/mytang0/brook/common/holder/UserHolder.java similarity index 80% rename from brook-common/src/main/java/org/mytang/brook/common/holder/UserHolder.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/holder/UserHolder.java index f300632..a60e4b1 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/holder/UserHolder.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/holder/UserHolder.java @@ -1,6 +1,6 @@ -package org.mytang.brook.common.holder; +package xyz.mytang0.brook.common.holder; -import org.mytang.brook.common.metadata.model.User; +import xyz.mytang0.brook.common.metadata.model.User; public abstract class UserHolder { diff --git a/brook-common/src/main/java/org/mytang/brook/common/metadata/definition/FlowDef.java b/brook-common/src/main/java/xyz/mytang0/brook/common/metadata/definition/FlowDef.java similarity index 87% rename from brook-common/src/main/java/org/mytang/brook/common/metadata/definition/FlowDef.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/metadata/definition/FlowDef.java index de82dee..c510608 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/metadata/definition/FlowDef.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/metadata/definition/FlowDef.java @@ -1,6 +1,6 @@ -package org.mytang.brook.common.metadata.definition; +package xyz.mytang0.brook.common.metadata.definition; -import org.mytang.brook.common.utils.JsonUtils; +import xyz.mytang0.brook.common.utils.JsonUtils; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; @@ -10,7 +10,7 @@ import java.io.Serializable; import java.util.List; -import static org.mytang.brook.common.metadata.definition.FlowDef.TimeoutPolicy.ALERT_ONLY; +import static xyz.mytang0.brook.common.metadata.definition.FlowDef.TimeoutPolicy.ALERT_ONLY; @Data public class FlowDef implements Serializable { diff --git a/brook-common/src/main/java/org/mytang/brook/common/metadata/definition/TaskDef.java b/brook-common/src/main/java/xyz/mytang0/brook/common/metadata/definition/TaskDef.java similarity index 97% rename from brook-common/src/main/java/org/mytang/brook/common/metadata/definition/TaskDef.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/metadata/definition/TaskDef.java index c3592a0..c9c051b 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/metadata/definition/TaskDef.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/metadata/definition/TaskDef.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.metadata.definition; +package xyz.mytang0.brook.common.metadata.definition; import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -14,8 +14,8 @@ import java.util.Map; import java.util.Optional; -import static org.mytang.brook.common.metadata.definition.TaskDef.RetryLogic.FIXED; -import static org.mytang.brook.common.metadata.definition.TaskDef.TimeoutPolicy.TIME_OUT; +import static xyz.mytang0.brook.common.metadata.definition.TaskDef.RetryLogic.FIXED; +import static xyz.mytang0.brook.common.metadata.definition.TaskDef.TimeoutPolicy.TIME_OUT; @Data public class TaskDef implements Serializable { diff --git a/brook-common/src/main/java/org/mytang/brook/common/metadata/enums/FlowStatus.java b/brook-common/src/main/java/xyz/mytang0/brook/common/metadata/enums/FlowStatus.java similarity index 93% rename from brook-common/src/main/java/org/mytang/brook/common/metadata/enums/FlowStatus.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/metadata/enums/FlowStatus.java index 5005393..738a2c4 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/metadata/enums/FlowStatus.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/metadata/enums/FlowStatus.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.metadata.enums; +package xyz.mytang0.brook.common.metadata.enums; public enum FlowStatus { RUNNING(false, false), diff --git a/brook-common/src/main/java/org/mytang/brook/common/metadata/enums/TaskStatus.java b/brook-common/src/main/java/xyz/mytang0/brook/common/metadata/enums/TaskStatus.java similarity index 96% rename from brook-common/src/main/java/org/mytang/brook/common/metadata/enums/TaskStatus.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/metadata/enums/TaskStatus.java index f3f21c6..68051f6 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/metadata/enums/TaskStatus.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/metadata/enums/TaskStatus.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.metadata.enums; +package xyz.mytang0.brook.common.metadata.enums; public enum TaskStatus { SCHEDULED(false, true, true), diff --git a/brook-common/src/main/java/org/mytang/brook/common/metadata/extension/Extension.java b/brook-common/src/main/java/xyz/mytang0/brook/common/metadata/extension/Extension.java similarity index 81% rename from brook-common/src/main/java/org/mytang/brook/common/metadata/extension/Extension.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/metadata/extension/Extension.java index 13979ad..80874fe 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/metadata/extension/Extension.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/metadata/extension/Extension.java @@ -1,6 +1,6 @@ -package org.mytang.brook.common.metadata.extension; +package xyz.mytang0.brook.common.metadata.extension; -import org.mytang.brook.common.configuration.Validatable; +import xyz.mytang0.brook.common.configuration.Validatable; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/brook-common/src/main/java/org/mytang/brook/common/metadata/instance/FlowInstance.java b/brook-common/src/main/java/xyz/mytang0/brook/common/metadata/instance/FlowInstance.java similarity index 85% rename from brook-common/src/main/java/org/mytang/brook/common/metadata/instance/FlowInstance.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/metadata/instance/FlowInstance.java index 7277f72..b148e8d 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/metadata/instance/FlowInstance.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/metadata/instance/FlowInstance.java @@ -1,13 +1,13 @@ -package org.mytang.brook.common.metadata.instance; - -import org.mytang.brook.common.holder.UserHolder; -import org.mytang.brook.common.metadata.definition.FlowDef; -import org.mytang.brook.common.metadata.enums.FlowStatus; -import org.mytang.brook.common.metadata.extension.Extension; -import org.mytang.brook.common.metadata.model.User; -import org.mytang.brook.common.utils.IDUtils; -import org.mytang.brook.common.utils.StringUtils; -import org.mytang.brook.common.utils.TimeUtils; +package xyz.mytang0.brook.common.metadata.instance; + +import xyz.mytang0.brook.common.holder.UserHolder; +import xyz.mytang0.brook.common.metadata.definition.FlowDef; +import xyz.mytang0.brook.common.metadata.enums.FlowStatus; +import xyz.mytang0.brook.common.metadata.extension.Extension; +import xyz.mytang0.brook.common.metadata.model.User; +import xyz.mytang0.brook.common.utils.IDUtils; +import xyz.mytang0.brook.common.utils.StringUtils; +import xyz.mytang0.brook.common.utils.TimeUtils; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; diff --git a/brook-common/src/main/java/org/mytang/brook/common/metadata/instance/TaskInstance.java b/brook-common/src/main/java/xyz/mytang0/brook/common/metadata/instance/TaskInstance.java similarity index 90% rename from brook-common/src/main/java/org/mytang/brook/common/metadata/instance/TaskInstance.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/metadata/instance/TaskInstance.java index e56cc19..627e8d0 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/metadata/instance/TaskInstance.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/metadata/instance/TaskInstance.java @@ -1,12 +1,12 @@ -package org.mytang.brook.common.metadata.instance; - -import org.mytang.brook.common.configuration.Configuration; -import org.mytang.brook.common.metadata.definition.TaskDef; -import org.mytang.brook.common.metadata.enums.TaskStatus; -import org.mytang.brook.common.metadata.extension.Extension; -import org.mytang.brook.common.utils.IDUtils; -import org.mytang.brook.common.utils.JsonUtils; -import org.mytang.brook.common.utils.TimeUtils; +package xyz.mytang0.brook.common.metadata.instance; + +import xyz.mytang0.brook.common.configuration.Configuration; +import xyz.mytang0.brook.common.metadata.definition.TaskDef; +import xyz.mytang0.brook.common.metadata.enums.TaskStatus; +import xyz.mytang0.brook.common.metadata.extension.Extension; +import xyz.mytang0.brook.common.utils.IDUtils; +import xyz.mytang0.brook.common.utils.JsonUtils; +import xyz.mytang0.brook.common.utils.TimeUtils; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; import lombok.Data; @@ -15,7 +15,7 @@ import java.util.Map; import java.util.Optional; -import static org.mytang.brook.common.utils.FieldUtils.getProperty; +import static xyz.mytang0.brook.common.utils.FieldUtils.getProperty; @Data public class TaskInstance implements Serializable { diff --git a/brook-common/src/main/java/org/mytang/brook/common/metadata/model/QueueMessage.java b/brook-common/src/main/java/xyz/mytang0/brook/common/metadata/model/QueueMessage.java similarity index 86% rename from brook-common/src/main/java/org/mytang/brook/common/metadata/model/QueueMessage.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/metadata/model/QueueMessage.java index ede5798..4281395 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/metadata/model/QueueMessage.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/metadata/model/QueueMessage.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.metadata.model; +package xyz.mytang0.brook.common.metadata.model; import lombok.Data; diff --git a/brook-common/src/main/java/org/mytang/brook/common/metadata/model/SkipTaskReq.java b/brook-common/src/main/java/xyz/mytang0/brook/common/metadata/model/SkipTaskReq.java similarity index 89% rename from brook-common/src/main/java/org/mytang/brook/common/metadata/model/SkipTaskReq.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/metadata/model/SkipTaskReq.java index 047bc7a..8fbdce1 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/metadata/model/SkipTaskReq.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/metadata/model/SkipTaskReq.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.metadata.model; +package xyz.mytang0.brook.common.metadata.model; import lombok.Data; diff --git a/brook-common/src/main/java/org/mytang/brook/common/metadata/model/StartFlowReq.java b/brook-common/src/main/java/xyz/mytang0/brook/common/metadata/model/StartFlowReq.java similarity index 79% rename from brook-common/src/main/java/org/mytang/brook/common/metadata/model/StartFlowReq.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/metadata/model/StartFlowReq.java index aff2ff9..a3b38af 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/metadata/model/StartFlowReq.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/metadata/model/StartFlowReq.java @@ -1,7 +1,7 @@ -package org.mytang.brook.common.metadata.model; +package xyz.mytang0.brook.common.metadata.model; -import org.mytang.brook.common.metadata.definition.FlowDef; -import org.mytang.brook.common.metadata.extension.Extension; +import xyz.mytang0.brook.common.metadata.definition.FlowDef; +import xyz.mytang0.brook.common.metadata.extension.Extension; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/brook-common/src/main/java/org/mytang/brook/common/metadata/model/TaskResult.java b/brook-common/src/main/java/xyz/mytang0/brook/common/metadata/model/TaskResult.java similarity index 82% rename from brook-common/src/main/java/org/mytang/brook/common/metadata/model/TaskResult.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/metadata/model/TaskResult.java index 4c7f66a..3051658 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/metadata/model/TaskResult.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/metadata/model/TaskResult.java @@ -1,6 +1,6 @@ -package org.mytang.brook.common.metadata.model; +package xyz.mytang0.brook.common.metadata.model; -import org.mytang.brook.common.metadata.enums.TaskStatus; +import xyz.mytang0.brook.common.metadata.enums.TaskStatus; import lombok.Data; import javax.annotation.Nonnull; diff --git a/brook-common/src/main/java/org/mytang/brook/common/metadata/model/User.java b/brook-common/src/main/java/xyz/mytang0/brook/common/metadata/model/User.java similarity index 89% rename from brook-common/src/main/java/org/mytang/brook/common/metadata/model/User.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/metadata/model/User.java index 39aebc4..930c043 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/metadata/model/User.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/metadata/model/User.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.metadata.model; +package xyz.mytang0.brook.common.metadata.model; import lombok.Data; diff --git a/brook-common/src/main/java/org/mytang/brook/common/utils/DurationUtils.java b/brook-common/src/main/java/xyz/mytang0/brook/common/utils/DurationUtils.java similarity index 99% rename from brook-common/src/main/java/org/mytang/brook/common/utils/DurationUtils.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/utils/DurationUtils.java index 19b0dbb..eb28e87 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/utils/DurationUtils.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/utils/DurationUtils.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.utils; +package xyz.mytang0.brook.common.utils; import java.time.Duration; import java.time.temporal.ChronoUnit; diff --git a/brook-common/src/main/java/org/mytang/brook/common/utils/ExceptionUtils.java b/brook-common/src/main/java/xyz/mytang0/brook/common/utils/ExceptionUtils.java similarity index 97% rename from brook-common/src/main/java/org/mytang/brook/common/utils/ExceptionUtils.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/utils/ExceptionUtils.java index 3daee05..693d1b8 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/utils/ExceptionUtils.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/utils/ExceptionUtils.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.utils; +package xyz.mytang0.brook.common.utils; import org.apache.commons.lang3.StringUtils; diff --git a/brook-common/src/main/java/org/mytang/brook/common/utils/FieldUtils.java b/brook-common/src/main/java/xyz/mytang0/brook/common/utils/FieldUtils.java similarity index 99% rename from brook-common/src/main/java/org/mytang/brook/common/utils/FieldUtils.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/utils/FieldUtils.java index 97bf37e..77c79c4 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/utils/FieldUtils.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/utils/FieldUtils.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.utils; +package xyz.mytang0.brook.common.utils; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/brook-common/src/main/java/org/mytang/brook/common/utils/Holder.java b/brook-common/src/main/java/xyz/mytang0/brook/common/utils/Holder.java similarity index 81% rename from brook-common/src/main/java/org/mytang/brook/common/utils/Holder.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/utils/Holder.java index c92a55b..180ef22 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/utils/Holder.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/utils/Holder.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.utils; +package xyz.mytang0.brook.common.utils; public class Holder { diff --git a/brook-common/src/main/java/org/mytang/brook/common/utils/IDUtils.java b/brook-common/src/main/java/xyz/mytang0/brook/common/utils/IDUtils.java similarity index 99% rename from brook-common/src/main/java/org/mytang/brook/common/utils/IDUtils.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/utils/IDUtils.java index 1f1de7e..cc1baee 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/utils/IDUtils.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/utils/IDUtils.java @@ -1,7 +1,7 @@ -package org.mytang.brook.common.utils; +package xyz.mytang0.brook.common.utils; -import org.mytang.brook.common.metadata.definition.FlowDef; -import org.mytang.brook.common.metadata.definition.TaskDef; +import xyz.mytang0.brook.common.metadata.definition.FlowDef; +import xyz.mytang0.brook.common.metadata.definition.TaskDef; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/brook-common/src/main/java/org/mytang/brook/common/utils/JsonUtils.java b/brook-common/src/main/java/xyz/mytang0/brook/common/utils/JsonUtils.java similarity index 99% rename from brook-common/src/main/java/org/mytang/brook/common/utils/JsonUtils.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/utils/JsonUtils.java index 660c762..b7787ea 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/utils/JsonUtils.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/utils/JsonUtils.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.utils; +package xyz.mytang0.brook.common.utils; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/brook-common/src/main/java/org/mytang/brook/common/utils/MethodUtils.java b/brook-common/src/main/java/xyz/mytang0/brook/common/utils/MethodUtils.java similarity index 99% rename from brook-common/src/main/java/org/mytang/brook/common/utils/MethodUtils.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/utils/MethodUtils.java index 3471f99..726d314 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/utils/MethodUtils.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/utils/MethodUtils.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.utils; +package xyz.mytang0.brook.common.utils; import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/brook-common/src/main/java/org/mytang/brook/common/utils/ReflectUtils.java b/brook-common/src/main/java/xyz/mytang0/brook/common/utils/ReflectUtils.java similarity index 90% rename from brook-common/src/main/java/org/mytang/brook/common/utils/ReflectUtils.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/utils/ReflectUtils.java index 1a2299a..7caf2f8 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/utils/ReflectUtils.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/utils/ReflectUtils.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.utils; +package xyz.mytang0.brook.common.utils; import org.apache.commons.lang3.ClassUtils; diff --git a/brook-common/src/main/java/org/mytang/brook/common/utils/StringUtils.java b/brook-common/src/main/java/xyz/mytang0/brook/common/utils/StringUtils.java similarity index 98% rename from brook-common/src/main/java/org/mytang/brook/common/utils/StringUtils.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/utils/StringUtils.java index 42a86aa..6c9e938 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/utils/StringUtils.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/utils/StringUtils.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.utils; +package xyz.mytang0.brook.common.utils; public final class StringUtils { diff --git a/brook-common/src/main/java/org/mytang/brook/common/utils/TimeUtils.java b/brook-common/src/main/java/xyz/mytang0/brook/common/utils/TimeUtils.java similarity index 98% rename from brook-common/src/main/java/org/mytang/brook/common/utils/TimeUtils.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/utils/TimeUtils.java index 0283a7a..ca1c734 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/utils/TimeUtils.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/utils/TimeUtils.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.utils; +package xyz.mytang0.brook.common.utils; import org.apache.commons.lang3.time.FastDateFormat; diff --git a/brook-common/src/main/java/org/mytang/brook/common/utils/URIUtils.java b/brook-common/src/main/java/xyz/mytang0/brook/common/utils/URIUtils.java similarity index 89% rename from brook-common/src/main/java/org/mytang/brook/common/utils/URIUtils.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/utils/URIUtils.java index 7e1c74f..44b4444 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/utils/URIUtils.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/utils/URIUtils.java @@ -1,6 +1,6 @@ -package org.mytang.brook.common.utils; +package xyz.mytang0.brook.common.utils; -import org.mytang.brook.common.constants.Delimiter; +import xyz.mytang0.brook.common.constants.Delimiter; import java.net.URI; import java.util.HashMap; diff --git a/brook-common/src/main/java/org/mytang/brook/common/utils/token/TokenHandler.java b/brook-common/src/main/java/xyz/mytang0/brook/common/utils/token/TokenHandler.java similarity index 61% rename from brook-common/src/main/java/org/mytang/brook/common/utils/token/TokenHandler.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/utils/token/TokenHandler.java index b3f6d77..40d0b02 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/utils/token/TokenHandler.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/utils/token/TokenHandler.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.utils.token; +package xyz.mytang0.brook.common.utils.token; public interface TokenHandler { diff --git a/brook-common/src/main/java/org/mytang/brook/common/utils/token/TokenParser.java b/brook-common/src/main/java/xyz/mytang0/brook/common/utils/token/TokenParser.java similarity index 99% rename from brook-common/src/main/java/org/mytang/brook/common/utils/token/TokenParser.java rename to brook-common/src/main/java/xyz/mytang0/brook/common/utils/token/TokenParser.java index 67d7bb6..fa8814e 100644 --- a/brook-common/src/main/java/org/mytang/brook/common/utils/token/TokenParser.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/utils/token/TokenParser.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.utils.token; +package xyz.mytang0.brook.common.utils.token; import java.util.ArrayList; import java.util.List; diff --git a/brook-common/src/main/resources/META-INF/brook/org.mytang.brook.common.extension.injector.ExtensionInjector b/brook-common/src/main/resources/META-INF/brook/org.mytang.brook.common.extension.injector.ExtensionInjector deleted file mode 100644 index 11d1a08..0000000 --- a/brook-common/src/main/resources/META-INF/brook/org.mytang.brook.common.extension.injector.ExtensionInjector +++ /dev/null @@ -1 +0,0 @@ -spi=org.mytang.brook.common.extension.injector.SpiExtensionInjector \ No newline at end of file diff --git a/brook-common/src/main/resources/META-INF/brook/xyz.mytang0.brook.common.extension.injector.ExtensionInjector b/brook-common/src/main/resources/META-INF/brook/xyz.mytang0.brook.common.extension.injector.ExtensionInjector new file mode 100644 index 0000000..accd7a9 --- /dev/null +++ b/brook-common/src/main/resources/META-INF/brook/xyz.mytang0.brook.common.extension.injector.ExtensionInjector @@ -0,0 +1 @@ +spi=xyz.mytang0.brook.common.extension.injector.SpiExtensionInjector \ No newline at end of file diff --git a/brook-common/src/main/resources/META-INF/services/org.mytang.brook.common.extension.loading.LoadingStrategy b/brook-common/src/main/resources/META-INF/services/org.mytang.brook.common.extension.loading.LoadingStrategy deleted file mode 100644 index 89b4365..0000000 --- a/brook-common/src/main/resources/META-INF/services/org.mytang.brook.common.extension.loading.LoadingStrategy +++ /dev/null @@ -1,3 +0,0 @@ -org.mytang.brook.common.extension.loading.DirectoryLoadingStrategy -org.mytang.brook.common.extension.loading.ServiceLoadingStrategy -org.mytang.brook.common.extension.loading.ExtensionLoadingStrategy diff --git a/brook-common/src/main/resources/META-INF/services/xyz.mytang0.brook.common.extension.loading.LoadingStrategy b/brook-common/src/main/resources/META-INF/services/xyz.mytang0.brook.common.extension.loading.LoadingStrategy new file mode 100644 index 0000000..6a36878 --- /dev/null +++ b/brook-common/src/main/resources/META-INF/services/xyz.mytang0.brook.common.extension.loading.LoadingStrategy @@ -0,0 +1,3 @@ +xyz.mytang0.brook.common.extension.loading.DirectoryLoadingStrategy +xyz.mytang0.brook.common.extension.loading.ServiceLoadingStrategy +xyz.mytang0.brook.common.extension.loading.ExtensionLoadingStrategy diff --git a/brook-common/src/test/java/org/mytang/brook/common/annotation/OrderComparatorTest.java b/brook-common/src/test/java/xyz/mytang0/brook/common/annotation/OrderComparatorTest.java similarity index 95% rename from brook-common/src/test/java/org/mytang/brook/common/annotation/OrderComparatorTest.java rename to brook-common/src/test/java/xyz/mytang0/brook/common/annotation/OrderComparatorTest.java index d0c22eb..9260abf 100644 --- a/brook-common/src/test/java/org/mytang/brook/common/annotation/OrderComparatorTest.java +++ b/brook-common/src/test/java/xyz/mytang0/brook/common/annotation/OrderComparatorTest.java @@ -1,4 +1,4 @@ -package org.mytang.brook.common.annotation; +package xyz.mytang0.brook.common.annotation; import org.junit.Assert; import org.junit.Test; diff --git a/brook-common/src/test/java/org/mytang/brook/common/configuration/ConfigurationTest.java b/brook-common/src/test/java/xyz/mytang0/brook/common/configuration/ConfigurationTest.java similarity index 88% rename from brook-common/src/test/java/org/mytang/brook/common/configuration/ConfigurationTest.java rename to brook-common/src/test/java/xyz/mytang0/brook/common/configuration/ConfigurationTest.java index 753fcd4..1ab99ff 100644 --- a/brook-common/src/test/java/org/mytang/brook/common/configuration/ConfigurationTest.java +++ b/brook-common/src/test/java/xyz/mytang0/brook/common/configuration/ConfigurationTest.java @@ -1,6 +1,6 @@ -package org.mytang.brook.common.configuration; +package xyz.mytang0.brook.common.configuration; -import org.mytang.brook.common.metadata.extension.Extension; +import xyz.mytang0.brook.common.metadata.extension.Extension; import org.junit.Assert; import org.junit.Test; diff --git a/brook-core/pom.xml b/brook-core/pom.xml index 601c18f..0d2377d 100644 --- a/brook-core/pom.xml +++ b/brook-core/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.mytang.brook + xyz.mytang0.brook brook-parent ${revision} ../pom.xml @@ -16,13 +16,13 @@ - org.mytang.brook + xyz.mytang0.brook brook-common ${project.version} - org.mytang.brook + xyz.mytang0.brook brook-spi ${project.version} diff --git a/brook-core/src/main/java/org/mytang/brook/core/FlowExecutor.java b/brook-core/src/main/java/xyz/mytang0/brook/core/FlowExecutor.java similarity index 95% rename from brook-core/src/main/java/org/mytang/brook/core/FlowExecutor.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/FlowExecutor.java index 48522e3..63407be 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/FlowExecutor.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/FlowExecutor.java @@ -1,44 +1,44 @@ -package org.mytang.brook.core; - -import org.mytang.brook.common.configuration.Configuration; -import org.mytang.brook.common.constants.Delimiter; -import org.mytang.brook.common.context.FlowContext; -import org.mytang.brook.common.context.TaskMapperContext; -import org.mytang.brook.common.exception.BizException; -import org.mytang.brook.common.extension.ExtensionDirector; -import org.mytang.brook.common.extension.ExtensionLoader; -import org.mytang.brook.common.metadata.definition.FlowDef; -import org.mytang.brook.common.metadata.definition.TaskDef; -import org.mytang.brook.common.metadata.enums.FlowStatus; -import org.mytang.brook.common.metadata.enums.TaskStatus; -import org.mytang.brook.common.metadata.instance.FlowInstance; -import org.mytang.brook.common.metadata.instance.TaskInstance; -import org.mytang.brook.common.metadata.model.QueueMessage; -import org.mytang.brook.common.metadata.model.SkipTaskReq; -import org.mytang.brook.common.metadata.model.StartFlowReq; -import org.mytang.brook.common.metadata.model.TaskResult; -import org.mytang.brook.common.utils.ExceptionUtils; -import org.mytang.brook.common.utils.JsonUtils; -import org.mytang.brook.common.utils.TimeUtils; -import org.mytang.brook.core.aspect.FlowAspect; -import org.mytang.brook.core.aspect.TaskAspect; -import org.mytang.brook.core.exception.FlowException; -import org.mytang.brook.core.exception.TerminateException; -import org.mytang.brook.core.execution.ExecutionProperties; -import org.mytang.brook.core.lock.FlowLockFacade; -import org.mytang.brook.core.metadata.MetadataFacade; -import org.mytang.brook.core.metadata.MetadataProperties; -import org.mytang.brook.core.monitor.DelayedTaskMonitor; -import org.mytang.brook.core.monitor.DelayedTaskMonitorProperties; -import org.mytang.brook.core.queue.QueueProperties; -import org.mytang.brook.spi.cache.FlowCache; -import org.mytang.brook.spi.cache.FlowCacheFactory; -import org.mytang.brook.spi.computing.EngineActuator; -import org.mytang.brook.spi.execution.ExecutionDAO; -import org.mytang.brook.spi.executor.ExecutorFactory; -import org.mytang.brook.spi.metadata.MetadataService; -import org.mytang.brook.spi.queue.QueueService; -import org.mytang.brook.spi.task.FlowTask; +package xyz.mytang0.brook.core; + +import xyz.mytang0.brook.common.configuration.Configuration; +import xyz.mytang0.brook.common.constants.Delimiter; +import xyz.mytang0.brook.common.context.FlowContext; +import xyz.mytang0.brook.common.context.TaskMapperContext; +import xyz.mytang0.brook.common.exception.BizException; +import xyz.mytang0.brook.common.extension.ExtensionDirector; +import xyz.mytang0.brook.common.extension.ExtensionLoader; +import xyz.mytang0.brook.common.metadata.definition.FlowDef; +import xyz.mytang0.brook.common.metadata.definition.TaskDef; +import xyz.mytang0.brook.common.metadata.enums.FlowStatus; +import xyz.mytang0.brook.common.metadata.enums.TaskStatus; +import xyz.mytang0.brook.common.metadata.instance.FlowInstance; +import xyz.mytang0.brook.common.metadata.instance.TaskInstance; +import xyz.mytang0.brook.common.metadata.model.QueueMessage; +import xyz.mytang0.brook.common.metadata.model.SkipTaskReq; +import xyz.mytang0.brook.common.metadata.model.StartFlowReq; +import xyz.mytang0.brook.common.metadata.model.TaskResult; +import xyz.mytang0.brook.common.utils.ExceptionUtils; +import xyz.mytang0.brook.common.utils.JsonUtils; +import xyz.mytang0.brook.common.utils.TimeUtils; +import xyz.mytang0.brook.core.aspect.FlowAspect; +import xyz.mytang0.brook.core.aspect.TaskAspect; +import xyz.mytang0.brook.core.exception.FlowException; +import xyz.mytang0.brook.core.exception.TerminateException; +import xyz.mytang0.brook.core.execution.ExecutionProperties; +import xyz.mytang0.brook.core.lock.FlowLockFacade; +import xyz.mytang0.brook.core.metadata.MetadataFacade; +import xyz.mytang0.brook.core.metadata.MetadataProperties; +import xyz.mytang0.brook.core.monitor.DelayedTaskMonitor; +import xyz.mytang0.brook.core.monitor.DelayedTaskMonitorProperties; +import xyz.mytang0.brook.core.queue.QueueProperties; +import xyz.mytang0.brook.spi.cache.FlowCache; +import xyz.mytang0.brook.spi.cache.FlowCacheFactory; +import xyz.mytang0.brook.spi.computing.EngineActuator; +import xyz.mytang0.brook.spi.execution.ExecutionDAO; +import xyz.mytang0.brook.spi.executor.ExecutorFactory; +import xyz.mytang0.brook.spi.metadata.MetadataService; +import xyz.mytang0.brook.spi.queue.QueueService; +import xyz.mytang0.brook.spi.task.FlowTask; import com.google.common.base.Joiner; import lombok.Data; import lombok.extern.slf4j.Slf4j; @@ -64,23 +64,23 @@ import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; -import static org.mytang.brook.core.constants.FlowConstants.DEFAULT_ENGINE_TYPE; -import static org.mytang.brook.core.constants.FlowConstants.DEFAULT_TIMEOUT_MS; -import static org.mytang.brook.core.constants.FlowConstants.LOCK_TRY_TIME_MS; -import static org.mytang.brook.core.exception.FlowErrorCode.CONCURRENCY_LIMIT; -import static org.mytang.brook.core.exception.FlowErrorCode.FLOW_EXECUTION_CONFLICT; -import static org.mytang.brook.core.exception.FlowErrorCode.FLOW_EXECUTION_ERROR; -import static org.mytang.brook.core.exception.FlowErrorCode.FLOW_NOT_EXIST; -import static org.mytang.brook.core.exception.FlowErrorCode.TASK_NOT_EXIST; -import static org.mytang.brook.core.executor.ExecutorEnum.ASYNC_EXECUTOR; -import static org.mytang.brook.core.executor.ExecutorEnum.FLOW_STARTER; -import static org.mytang.brook.core.utils.ParameterUtils.flowContext; -import static org.mytang.brook.core.utils.ParameterUtils.getFlowInput; -import static org.mytang.brook.core.utils.ParameterUtils.getFlowOutput; -import static org.mytang.brook.core.utils.ParameterUtils.getMappingValue; -import static org.mytang.brook.core.utils.ParameterUtils.getTaskInput; -import static org.mytang.brook.core.utils.ParameterUtils.getTaskOutput; -import static org.mytang.brook.core.utils.QueueUtils.getTaskDelayQueueName; +import static xyz.mytang0.brook.core.constants.FlowConstants.DEFAULT_ENGINE_TYPE; +import static xyz.mytang0.brook.core.constants.FlowConstants.DEFAULT_TIMEOUT_MS; +import static xyz.mytang0.brook.core.constants.FlowConstants.LOCK_TRY_TIME_MS; +import static xyz.mytang0.brook.core.exception.FlowErrorCode.CONCURRENCY_LIMIT; +import static xyz.mytang0.brook.core.exception.FlowErrorCode.FLOW_EXECUTION_CONFLICT; +import static xyz.mytang0.brook.core.exception.FlowErrorCode.FLOW_EXECUTION_ERROR; +import static xyz.mytang0.brook.core.exception.FlowErrorCode.FLOW_NOT_EXIST; +import static xyz.mytang0.brook.core.exception.FlowErrorCode.TASK_NOT_EXIST; +import static xyz.mytang0.brook.core.executor.ExecutorEnum.ASYNC_EXECUTOR; +import static xyz.mytang0.brook.core.executor.ExecutorEnum.FLOW_STARTER; +import static xyz.mytang0.brook.core.utils.ParameterUtils.flowContext; +import static xyz.mytang0.brook.core.utils.ParameterUtils.getFlowInput; +import static xyz.mytang0.brook.core.utils.ParameterUtils.getFlowOutput; +import static xyz.mytang0.brook.core.utils.ParameterUtils.getMappingValue; +import static xyz.mytang0.brook.core.utils.ParameterUtils.getTaskInput; +import static xyz.mytang0.brook.core.utils.ParameterUtils.getTaskOutput; +import static xyz.mytang0.brook.core.utils.QueueUtils.getTaskDelayQueueName; import static java.util.Objects.requireNonNull; @Slf4j diff --git a/brook-core/src/main/java/org/mytang/brook/core/FlowTaskRegistry.java b/brook-core/src/main/java/xyz/mytang0/brook/core/FlowTaskRegistry.java similarity index 91% rename from brook-core/src/main/java/org/mytang/brook/core/FlowTaskRegistry.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/FlowTaskRegistry.java index 5afcb12..efe1bd2 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/FlowTaskRegistry.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/FlowTaskRegistry.java @@ -1,9 +1,9 @@ -package org.mytang.brook.core; +package xyz.mytang0.brook.core; -import org.mytang.brook.common.extension.ExtensionDirector; -import org.mytang.brook.core.exception.FlowErrorCode; -import org.mytang.brook.core.exception.FlowException; -import org.mytang.brook.spi.task.FlowTask; +import xyz.mytang0.brook.common.extension.ExtensionDirector; +import xyz.mytang0.brook.core.exception.FlowErrorCode; +import xyz.mytang0.brook.core.exception.FlowException; +import xyz.mytang0.brook.spi.task.FlowTask; import lombok.extern.slf4j.Slf4j; import java.lang.reflect.ParameterizedType; diff --git a/brook-core/src/main/java/org/mytang/brook/core/aspect/FlowAspect.java b/brook-core/src/main/java/xyz/mytang0/brook/core/aspect/FlowAspect.java similarity index 77% rename from brook-core/src/main/java/org/mytang/brook/core/aspect/FlowAspect.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/aspect/FlowAspect.java index c8af643..8f0e34c 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/aspect/FlowAspect.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/aspect/FlowAspect.java @@ -1,7 +1,7 @@ -package org.mytang.brook.core.aspect; +package xyz.mytang0.brook.core.aspect; -import org.mytang.brook.common.metadata.instance.FlowInstance; -import org.mytang.brook.core.listener.FlowListenerFacade; +import xyz.mytang0.brook.common.metadata.instance.FlowInstance; +import xyz.mytang0.brook.core.listener.FlowListenerFacade; public final class FlowAspect { diff --git a/brook-core/src/main/java/org/mytang/brook/core/aspect/TaskAspect.java b/brook-core/src/main/java/xyz/mytang0/brook/core/aspect/TaskAspect.java similarity index 77% rename from brook-core/src/main/java/org/mytang/brook/core/aspect/TaskAspect.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/aspect/TaskAspect.java index a51a6f4..48dfb9f 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/aspect/TaskAspect.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/aspect/TaskAspect.java @@ -1,9 +1,9 @@ -package org.mytang.brook.core.aspect; +package xyz.mytang0.brook.core.aspect; -import org.mytang.brook.common.metadata.enums.TaskStatus; -import org.mytang.brook.common.metadata.instance.TaskInstance; -import org.mytang.brook.core.callback.TaskCallbackFacade; -import org.mytang.brook.core.listener.TaskListenerFacade; +import xyz.mytang0.brook.common.metadata.enums.TaskStatus; +import xyz.mytang0.brook.common.metadata.instance.TaskInstance; +import xyz.mytang0.brook.core.callback.TaskCallbackFacade; +import xyz.mytang0.brook.core.listener.TaskListenerFacade; public final class TaskAspect { diff --git a/brook-core/src/main/java/org/mytang/brook/core/cache/DefaultFlowCache.java b/brook-core/src/main/java/xyz/mytang0/brook/core/cache/DefaultFlowCache.java similarity index 90% rename from brook-core/src/main/java/org/mytang/brook/core/cache/DefaultFlowCache.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/cache/DefaultFlowCache.java index 583b184..96fd984 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/cache/DefaultFlowCache.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/cache/DefaultFlowCache.java @@ -1,9 +1,9 @@ -package org.mytang.brook.core.cache; +package xyz.mytang0.brook.core.cache; -import org.mytang.brook.spi.cache.FlowCache; +import xyz.mytang0.brook.spi.cache.FlowCache; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; -import org.mytang.brook.core.constants.FlowConstants; +import xyz.mytang0.brook.core.constants.FlowConstants; import java.util.Optional; import java.util.concurrent.TimeUnit; diff --git a/brook-core/src/main/java/org/mytang/brook/core/cache/DefaultFlowCacheFactory.java b/brook-core/src/main/java/xyz/mytang0/brook/core/cache/DefaultFlowCacheFactory.java similarity index 82% rename from brook-core/src/main/java/org/mytang/brook/core/cache/DefaultFlowCacheFactory.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/cache/DefaultFlowCacheFactory.java index d86592a..c99ac1f 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/cache/DefaultFlowCacheFactory.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/cache/DefaultFlowCacheFactory.java @@ -1,7 +1,7 @@ -package org.mytang.brook.core.cache; +package xyz.mytang0.brook.core.cache; -import org.mytang.brook.spi.cache.FlowCache; -import org.mytang.brook.spi.cache.FlowCacheFactory; +import xyz.mytang0.brook.spi.cache.FlowCache; +import xyz.mytang0.brook.spi.cache.FlowCacheFactory; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/brook-core/src/main/java/org/mytang/brook/core/callback/DefaultClassTaskCallback.java b/brook-core/src/main/java/xyz/mytang0/brook/core/callback/DefaultClassTaskCallback.java similarity index 91% rename from brook-core/src/main/java/org/mytang/brook/core/callback/DefaultClassTaskCallback.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/callback/DefaultClassTaskCallback.java index 35ba6be..176bfff 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/callback/DefaultClassTaskCallback.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/callback/DefaultClassTaskCallback.java @@ -1,12 +1,12 @@ -package org.mytang.brook.core.callback; +package xyz.mytang0.brook.core.callback; -import org.mytang.brook.common.metadata.instance.TaskInstance; -import org.mytang.brook.common.utils.JsonUtils; -import org.mytang.brook.common.utils.StringUtils; -import org.mytang.brook.spi.callback.TaskCallback; +import xyz.mytang0.brook.common.metadata.instance.TaskInstance; +import xyz.mytang0.brook.common.utils.JsonUtils; +import xyz.mytang0.brook.common.utils.StringUtils; +import xyz.mytang0.brook.spi.callback.TaskCallback; import lombok.Data; import org.apache.commons.lang3.ClassUtils; -import org.mytang.brook.spi.callback.ClassTaskCallback; +import xyz.mytang0.brook.spi.callback.ClassTaskCallback; import java.io.Serializable; import java.util.Objects; diff --git a/brook-core/src/main/java/org/mytang/brook/core/callback/TaskCallbackFacade.java b/brook-core/src/main/java/xyz/mytang0/brook/core/callback/TaskCallbackFacade.java similarity index 83% rename from brook-core/src/main/java/org/mytang/brook/core/callback/TaskCallbackFacade.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/callback/TaskCallbackFacade.java index 1ad5754..fd6cd5c 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/callback/TaskCallbackFacade.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/callback/TaskCallbackFacade.java @@ -1,13 +1,13 @@ -package org.mytang.brook.core.callback; +package xyz.mytang0.brook.core.callback; -import org.mytang.brook.common.context.FlowContext; -import org.mytang.brook.common.extension.ExtensionDirector; -import org.mytang.brook.common.metadata.definition.TaskDef; -import org.mytang.brook.common.metadata.instance.FlowInstance; -import org.mytang.brook.common.metadata.instance.TaskInstance; -import org.mytang.brook.common.utils.StringUtils; -import org.mytang.brook.spi.callback.TaskCallback; -import org.mytang.brook.spi.executor.ExecutorFactory; +import xyz.mytang0.brook.common.context.FlowContext; +import xyz.mytang0.brook.common.extension.ExtensionDirector; +import xyz.mytang0.brook.common.metadata.definition.TaskDef; +import xyz.mytang0.brook.common.metadata.instance.FlowInstance; +import xyz.mytang0.brook.common.metadata.instance.TaskInstance; +import xyz.mytang0.brook.common.utils.StringUtils; +import xyz.mytang0.brook.spi.callback.TaskCallback; +import xyz.mytang0.brook.spi.executor.ExecutorFactory; import java.util.concurrent.ExecutorService; diff --git a/brook-core/src/main/java/org/mytang/brook/core/computing/DefaultEngineActuator.java b/brook-core/src/main/java/xyz/mytang0/brook/core/computing/DefaultEngineActuator.java similarity index 83% rename from brook-core/src/main/java/org/mytang/brook/core/computing/DefaultEngineActuator.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/computing/DefaultEngineActuator.java index b54ad27..a20f101 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/computing/DefaultEngineActuator.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/computing/DefaultEngineActuator.java @@ -1,15 +1,15 @@ -package org.mytang.brook.core.computing; +package xyz.mytang0.brook.core.computing; -import org.mytang.brook.common.exception.BizException; -import org.mytang.brook.common.extension.ExtensionDirector; -import org.mytang.brook.common.extension.ExtensionLoader; -import org.mytang.brook.common.utils.ExceptionUtils; -import org.mytang.brook.core.exception.TerminateException; -import org.mytang.brook.spi.computing.Engine; -import org.mytang.brook.spi.computing.EngineActuator; -import org.mytang.brook.spi.oss.OSSService; -import org.mytang.brook.spi.oss.OSSStorage; +import xyz.mytang0.brook.common.exception.BizException; +import xyz.mytang0.brook.common.extension.ExtensionDirector; +import xyz.mytang0.brook.common.extension.ExtensionLoader; +import xyz.mytang0.brook.common.utils.ExceptionUtils; +import xyz.mytang0.brook.core.exception.TerminateException; +import xyz.mytang0.brook.spi.computing.Engine; +import xyz.mytang0.brook.spi.computing.EngineActuator; +import xyz.mytang0.brook.spi.oss.OSSService; +import xyz.mytang0.brook.spi.oss.OSSStorage; import lombok.extern.slf4j.Slf4j; import java.io.BufferedReader; diff --git a/brook-core/src/main/java/org/mytang/brook/core/computing/JavascriptEngine.java b/brook-core/src/main/java/xyz/mytang0/brook/core/computing/JavascriptEngine.java similarity index 82% rename from brook-core/src/main/java/org/mytang/brook/core/computing/JavascriptEngine.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/computing/JavascriptEngine.java index 9277e5e..b8968dd 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/computing/JavascriptEngine.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/computing/JavascriptEngine.java @@ -1,14 +1,14 @@ -package org.mytang.brook.core.computing; +package xyz.mytang0.brook.core.computing; -import org.mytang.brook.spi.computing.Engine; +import xyz.mytang0.brook.spi.computing.Engine; import jdk.nashorn.api.scripting.NashornScriptEngineFactory; import lombok.extern.slf4j.Slf4j; import javax.script.Bindings; import javax.script.ScriptEngine; -import static org.mytang.brook.core.constants.FlowConstants.DEFAULT_ENGINE_TYPE; +import static xyz.mytang0.brook.core.constants.FlowConstants.DEFAULT_ENGINE_TYPE; @Slf4j public class JavascriptEngine implements Engine { diff --git a/brook-core/src/main/java/org/mytang/brook/core/computing/NoopEngine.java b/brook-core/src/main/java/xyz/mytang0/brook/core/computing/NoopEngine.java similarity index 77% rename from brook-core/src/main/java/org/mytang/brook/core/computing/NoopEngine.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/computing/NoopEngine.java index a02352c..54d2ce8 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/computing/NoopEngine.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/computing/NoopEngine.java @@ -1,6 +1,6 @@ -package org.mytang.brook.core.computing; +package xyz.mytang0.brook.core.computing; -import org.mytang.brook.spi.computing.Engine; +import xyz.mytang0.brook.spi.computing.Engine; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/brook-core/src/main/java/org/mytang/brook/core/constants/FlowConstants.java b/brook-core/src/main/java/xyz/mytang0/brook/core/constants/FlowConstants.java similarity index 94% rename from brook-core/src/main/java/org/mytang/brook/core/constants/FlowConstants.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/constants/FlowConstants.java index 67a60b8..22f2e52 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/constants/FlowConstants.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/constants/FlowConstants.java @@ -1,4 +1,4 @@ -package org.mytang.brook.core.constants; +package xyz.mytang0.brook.core.constants; public interface FlowConstants { diff --git a/brook-core/src/main/java/org/mytang/brook/core/exception/FlowErrorCode.java b/brook-core/src/main/java/xyz/mytang0/brook/core/exception/FlowErrorCode.java similarity index 83% rename from brook-core/src/main/java/org/mytang/brook/core/exception/FlowErrorCode.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/exception/FlowErrorCode.java index c5c020d..cb85db5 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/exception/FlowErrorCode.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/exception/FlowErrorCode.java @@ -1,9 +1,9 @@ -package org.mytang.brook.core.exception; +package xyz.mytang0.brook.core.exception; -import org.mytang.brook.common.exception.ErrorCode; -import org.mytang.brook.common.exception.ErrorCodeSupplier; -import org.mytang.brook.common.exception.ErrorType; +import xyz.mytang0.brook.common.exception.ErrorCode; +import xyz.mytang0.brook.common.exception.ErrorCodeSupplier; +import xyz.mytang0.brook.common.exception.ErrorType; public enum FlowErrorCode implements ErrorCodeSupplier { diff --git a/brook-core/src/main/java/org/mytang/brook/core/exception/FlowException.java b/brook-core/src/main/java/xyz/mytang0/brook/core/exception/FlowException.java similarity index 81% rename from brook-core/src/main/java/org/mytang/brook/core/exception/FlowException.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/exception/FlowException.java index 95dca20..0f0c993 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/exception/FlowException.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/exception/FlowException.java @@ -1,6 +1,6 @@ -package org.mytang.brook.core.exception; +package xyz.mytang0.brook.core.exception; -import org.mytang.brook.common.exception.BizException; +import xyz.mytang0.brook.common.exception.BizException; public class FlowException extends BizException { diff --git a/brook-core/src/main/java/org/mytang/brook/core/exception/TerminateException.java b/brook-core/src/main/java/xyz/mytang0/brook/core/exception/TerminateException.java similarity index 84% rename from brook-core/src/main/java/org/mytang/brook/core/exception/TerminateException.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/exception/TerminateException.java index 60bbc63..e480b74 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/exception/TerminateException.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/exception/TerminateException.java @@ -1,8 +1,8 @@ -package org.mytang.brook.core.exception; +package xyz.mytang0.brook.core.exception; -import org.mytang.brook.common.utils.ExceptionUtils; -import org.mytang.brook.common.metadata.enums.FlowStatus; -import org.mytang.brook.common.metadata.instance.TaskInstance; +import xyz.mytang0.brook.common.utils.ExceptionUtils; +import xyz.mytang0.brook.common.metadata.enums.FlowStatus; +import xyz.mytang0.brook.common.metadata.instance.TaskInstance; public class TerminateException extends RuntimeException { diff --git a/brook-core/src/main/java/org/mytang/brook/core/execution/ExecutionProperties.java b/brook-core/src/main/java/xyz/mytang0/brook/core/execution/ExecutionProperties.java similarity index 78% rename from brook-core/src/main/java/org/mytang/brook/core/execution/ExecutionProperties.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/execution/ExecutionProperties.java index 8d82dee..f1a6f41 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/execution/ExecutionProperties.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/execution/ExecutionProperties.java @@ -1,4 +1,4 @@ -package org.mytang.brook.core.execution; +package xyz.mytang0.brook.core.execution; import lombok.Data; diff --git a/brook-core/src/main/java/org/mytang/brook/core/execution/LocalExecutionDAO.java b/brook-core/src/main/java/xyz/mytang0/brook/core/execution/LocalExecutionDAO.java similarity index 92% rename from brook-core/src/main/java/org/mytang/brook/core/execution/LocalExecutionDAO.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/execution/LocalExecutionDAO.java index bdbd564..9406aef 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/execution/LocalExecutionDAO.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/execution/LocalExecutionDAO.java @@ -1,10 +1,10 @@ -package org.mytang.brook.core.execution; +package xyz.mytang0.brook.core.execution; -import org.mytang.brook.common.extension.Disposable; -import org.mytang.brook.common.extension.Selected; -import org.mytang.brook.common.metadata.instance.FlowInstance; -import org.mytang.brook.common.metadata.instance.TaskInstance; -import org.mytang.brook.spi.execution.ExecutionDAO; +import xyz.mytang0.brook.common.extension.Disposable; +import xyz.mytang0.brook.common.extension.Selected; +import xyz.mytang0.brook.common.metadata.instance.FlowInstance; +import xyz.mytang0.brook.common.metadata.instance.TaskInstance; +import xyz.mytang0.brook.spi.execution.ExecutionDAO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/brook-core/src/main/java/org/mytang/brook/core/executor/DefaultExecutorFactory.java b/brook-core/src/main/java/xyz/mytang0/brook/core/executor/DefaultExecutorFactory.java similarity index 93% rename from brook-core/src/main/java/org/mytang/brook/core/executor/DefaultExecutorFactory.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/executor/DefaultExecutorFactory.java index fcd0258..a9f7785 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/executor/DefaultExecutorFactory.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/executor/DefaultExecutorFactory.java @@ -1,7 +1,7 @@ -package org.mytang.brook.core.executor; +package xyz.mytang0.brook.core.executor; -import org.mytang.brook.core.utils.ThreadUtils; -import org.mytang.brook.spi.executor.ExecutorFactory; +import xyz.mytang0.brook.core.utils.ThreadUtils; +import xyz.mytang0.brook.spi.executor.ExecutorFactory; import lombok.extern.slf4j.Slf4j; import java.util.Map; diff --git a/brook-core/src/main/java/org/mytang/brook/core/executor/ExecutorEnum.java b/brook-core/src/main/java/xyz/mytang0/brook/core/executor/ExecutorEnum.java similarity index 62% rename from brook-core/src/main/java/org/mytang/brook/core/executor/ExecutorEnum.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/executor/ExecutorEnum.java index 431d88c..29c0429 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/executor/ExecutorEnum.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/executor/ExecutorEnum.java @@ -1,4 +1,4 @@ -package org.mytang.brook.core.executor; +package xyz.mytang0.brook.core.executor; public enum ExecutorEnum { diff --git a/brook-core/src/main/java/org/mytang/brook/core/listener/FlowListenerFacade.java b/brook-core/src/main/java/xyz/mytang0/brook/core/listener/FlowListenerFacade.java similarity index 89% rename from brook-core/src/main/java/org/mytang/brook/core/listener/FlowListenerFacade.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/listener/FlowListenerFacade.java index a490329..f887c12 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/listener/FlowListenerFacade.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/listener/FlowListenerFacade.java @@ -1,10 +1,10 @@ -package org.mytang.brook.core.listener; +package xyz.mytang0.brook.core.listener; -import org.mytang.brook.common.extension.ExtensionDirector; -import org.mytang.brook.common.extension.ExtensionLoader; -import org.mytang.brook.common.metadata.instance.FlowInstance; -import org.mytang.brook.spi.executor.ExecutorFactory; -import org.mytang.brook.spi.listener.FlowListener; +import xyz.mytang0.brook.common.extension.ExtensionDirector; +import xyz.mytang0.brook.common.extension.ExtensionLoader; +import xyz.mytang0.brook.common.metadata.instance.FlowInstance; +import xyz.mytang0.brook.spi.executor.ExecutorFactory; +import xyz.mytang0.brook.spi.listener.FlowListener; import lombok.extern.slf4j.Slf4j; import java.util.concurrent.ExecutorService; diff --git a/brook-core/src/main/java/org/mytang/brook/core/listener/TaskListenerFacade.java b/brook-core/src/main/java/xyz/mytang0/brook/core/listener/TaskListenerFacade.java similarity index 87% rename from brook-core/src/main/java/org/mytang/brook/core/listener/TaskListenerFacade.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/listener/TaskListenerFacade.java index 2819f04..5ecd486 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/listener/TaskListenerFacade.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/listener/TaskListenerFacade.java @@ -1,12 +1,12 @@ -package org.mytang.brook.core.listener; +package xyz.mytang0.brook.core.listener; -import org.mytang.brook.common.context.FlowContext; -import org.mytang.brook.common.extension.ExtensionDirector; -import org.mytang.brook.common.extension.ExtensionLoader; -import org.mytang.brook.common.metadata.instance.FlowInstance; -import org.mytang.brook.common.metadata.instance.TaskInstance; -import org.mytang.brook.spi.executor.ExecutorFactory; -import org.mytang.brook.spi.listener.TaskListener; +import xyz.mytang0.brook.common.context.FlowContext; +import xyz.mytang0.brook.common.extension.ExtensionDirector; +import xyz.mytang0.brook.common.extension.ExtensionLoader; +import xyz.mytang0.brook.common.metadata.instance.FlowInstance; +import xyz.mytang0.brook.common.metadata.instance.TaskInstance; +import xyz.mytang0.brook.spi.executor.ExecutorFactory; +import xyz.mytang0.brook.spi.listener.TaskListener; import lombok.extern.slf4j.Slf4j; import java.util.Optional; diff --git a/brook-core/src/main/java/org/mytang/brook/core/lock/FlowLockFacade.java b/brook-core/src/main/java/xyz/mytang0/brook/core/lock/FlowLockFacade.java similarity index 92% rename from brook-core/src/main/java/org/mytang/brook/core/lock/FlowLockFacade.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/lock/FlowLockFacade.java index 52dd0c6..3342f9b 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/lock/FlowLockFacade.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/lock/FlowLockFacade.java @@ -1,7 +1,7 @@ -package org.mytang.brook.core.lock; +package xyz.mytang0.brook.core.lock; -import org.mytang.brook.common.extension.ExtensionLoader; -import org.mytang.brook.spi.lock.LockService; +import xyz.mytang0.brook.common.extension.ExtensionLoader; +import xyz.mytang0.brook.spi.lock.LockService; import lombok.extern.slf4j.Slf4j; import java.util.concurrent.TimeUnit; diff --git a/brook-core/src/main/java/org/mytang/brook/core/lock/LockProperties.java b/brook-core/src/main/java/xyz/mytang0/brook/core/lock/LockProperties.java similarity index 95% rename from brook-core/src/main/java/org/mytang/brook/core/lock/LockProperties.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/lock/LockProperties.java index 31ba568..f4b70fa 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/lock/LockProperties.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/lock/LockProperties.java @@ -1,4 +1,4 @@ -package org.mytang.brook.core.lock; +package xyz.mytang0.brook.core.lock; import lombok.Data; diff --git a/brook-core/src/main/java/org/mytang/brook/core/lock/support/LocalLockService.java b/brook-core/src/main/java/xyz/mytang0/brook/core/lock/support/LocalLockService.java similarity index 95% rename from brook-core/src/main/java/org/mytang/brook/core/lock/support/LocalLockService.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/lock/support/LocalLockService.java index c320d20..7c1db9b 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/lock/support/LocalLockService.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/lock/support/LocalLockService.java @@ -1,9 +1,9 @@ -package org.mytang.brook.core.lock.support; +package xyz.mytang0.brook.core.lock.support; -import org.mytang.brook.common.utils.TimeUtils; -import org.mytang.brook.core.utils.ThreadUtils; -import org.mytang.brook.spi.lock.LockService; +import xyz.mytang0.brook.common.utils.TimeUtils; +import xyz.mytang0.brook.core.utils.ThreadUtils; +import xyz.mytang0.brook.spi.lock.LockService; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; diff --git a/brook-core/src/main/java/org/mytang/brook/core/metadata/FileMetadataService.java b/brook-core/src/main/java/xyz/mytang0/brook/core/metadata/FileMetadataService.java similarity index 95% rename from brook-core/src/main/java/org/mytang/brook/core/metadata/FileMetadataService.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/metadata/FileMetadataService.java index 8687530..c074497 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/metadata/FileMetadataService.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/metadata/FileMetadataService.java @@ -1,9 +1,9 @@ -package org.mytang.brook.core.metadata; +package xyz.mytang0.brook.core.metadata; -import org.mytang.brook.common.metadata.definition.FlowDef; -import org.mytang.brook.common.utils.JsonUtils; -import org.mytang.brook.core.exception.FlowException; -import org.mytang.brook.spi.metadata.MetadataService; +import xyz.mytang0.brook.common.metadata.definition.FlowDef; +import xyz.mytang0.brook.common.utils.JsonUtils; +import xyz.mytang0.brook.core.exception.FlowException; +import xyz.mytang0.brook.spi.metadata.MetadataService; import com.fasterxml.jackson.core.type.TypeReference; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; @@ -25,7 +25,7 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; -import static org.mytang.brook.core.exception.FlowErrorCode.FLOW_UNSUPPORTED_OPERATION; +import static xyz.mytang0.brook.core.exception.FlowErrorCode.FLOW_UNSUPPORTED_OPERATION; @Slf4j public class FileMetadataService implements MetadataService { diff --git a/brook-core/src/main/java/org/mytang/brook/core/metadata/MetadataFacade.java b/brook-core/src/main/java/xyz/mytang0/brook/core/metadata/MetadataFacade.java similarity index 88% rename from brook-core/src/main/java/org/mytang/brook/core/metadata/MetadataFacade.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/metadata/MetadataFacade.java index 497192f..fe09d75 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/metadata/MetadataFacade.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/metadata/MetadataFacade.java @@ -1,8 +1,8 @@ -package org.mytang.brook.core.metadata; +package xyz.mytang0.brook.core.metadata; -import org.mytang.brook.common.extension.ExtensionDirector; -import org.mytang.brook.common.metadata.definition.FlowDef; -import org.mytang.brook.spi.metadata.MetadataService; +import xyz.mytang0.brook.common.extension.ExtensionDirector; +import xyz.mytang0.brook.common.metadata.definition.FlowDef; +import xyz.mytang0.brook.spi.metadata.MetadataService; import org.apache.commons.lang3.StringUtils; import java.util.Optional; diff --git a/brook-core/src/main/java/org/mytang/brook/core/metadata/MetadataProperties.java b/brook-core/src/main/java/xyz/mytang0/brook/core/metadata/MetadataProperties.java similarity index 79% rename from brook-core/src/main/java/org/mytang/brook/core/metadata/MetadataProperties.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/metadata/MetadataProperties.java index 7f04dcf..a0bd6f2 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/metadata/MetadataProperties.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/metadata/MetadataProperties.java @@ -1,4 +1,4 @@ -package org.mytang.brook.core.metadata; +package xyz.mytang0.brook.core.metadata; import lombok.Data; diff --git a/brook-core/src/main/java/org/mytang/brook/core/monitor/DelayedTaskMonitor.java b/brook-core/src/main/java/xyz/mytang0/brook/core/monitor/DelayedTaskMonitor.java similarity index 92% rename from brook-core/src/main/java/org/mytang/brook/core/monitor/DelayedTaskMonitor.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/monitor/DelayedTaskMonitor.java index 07e4629..178c943 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/monitor/DelayedTaskMonitor.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/monitor/DelayedTaskMonitor.java @@ -1,22 +1,22 @@ -package org.mytang.brook.core.monitor; - - -import org.mytang.brook.common.constants.Delimiter; -import org.mytang.brook.common.extension.ExtensionDirector; -import org.mytang.brook.common.extension.ExtensionLoader; -import org.mytang.brook.common.metadata.model.QueueMessage; -import org.mytang.brook.common.utils.ExceptionUtils; -import org.mytang.brook.common.utils.TimeUtils; -import org.mytang.brook.core.FlowExecutor; -import org.mytang.brook.core.exception.FlowException; -import org.mytang.brook.core.lock.FlowLockFacade; -import org.mytang.brook.core.utils.QueueUtils; -import org.mytang.brook.spi.executor.ExecutorFactory; -import org.mytang.brook.spi.queue.QueueService; +package xyz.mytang0.brook.core.monitor; + + +import xyz.mytang0.brook.common.constants.Delimiter; +import xyz.mytang0.brook.common.extension.ExtensionDirector; +import xyz.mytang0.brook.common.extension.ExtensionLoader; +import xyz.mytang0.brook.common.metadata.model.QueueMessage; +import xyz.mytang0.brook.common.utils.ExceptionUtils; +import xyz.mytang0.brook.common.utils.TimeUtils; +import xyz.mytang0.brook.core.FlowExecutor; +import xyz.mytang0.brook.core.exception.FlowException; +import xyz.mytang0.brook.core.lock.FlowLockFacade; +import xyz.mytang0.brook.core.utils.QueueUtils; +import xyz.mytang0.brook.spi.executor.ExecutorFactory; +import xyz.mytang0.brook.spi.queue.QueueService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.mytang.brook.core.utils.ThreadUtils; +import xyz.mytang0.brook.core.utils.ThreadUtils; import java.util.List; import java.util.Map; diff --git a/brook-core/src/main/java/org/mytang/brook/core/monitor/DelayedTaskMonitorProperties.java b/brook-core/src/main/java/xyz/mytang0/brook/core/monitor/DelayedTaskMonitorProperties.java similarity index 95% rename from brook-core/src/main/java/org/mytang/brook/core/monitor/DelayedTaskMonitorProperties.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/monitor/DelayedTaskMonitorProperties.java index dfb4b09..e5f8ef7 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/monitor/DelayedTaskMonitorProperties.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/monitor/DelayedTaskMonitorProperties.java @@ -1,4 +1,4 @@ -package org.mytang.brook.core.monitor; +package xyz.mytang0.brook.core.monitor; import lombok.Data; diff --git a/brook-core/src/main/java/org/mytang/brook/core/queue/LocalQueueService.java b/brook-core/src/main/java/xyz/mytang0/brook/core/queue/LocalQueueService.java similarity index 93% rename from brook-core/src/main/java/org/mytang/brook/core/queue/LocalQueueService.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/queue/LocalQueueService.java index 6c0af47..66df016 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/queue/LocalQueueService.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/queue/LocalQueueService.java @@ -1,9 +1,9 @@ -package org.mytang.brook.core.queue; +package xyz.mytang0.brook.core.queue; -import org.mytang.brook.common.extension.Disposable; -import org.mytang.brook.common.metadata.model.QueueMessage; -import org.mytang.brook.core.utils.ThreadUtils; -import org.mytang.brook.spi.queue.QueueService; +import xyz.mytang0.brook.common.extension.Disposable; +import xyz.mytang0.brook.common.metadata.model.QueueMessage; +import xyz.mytang0.brook.core.utils.ThreadUtils; +import xyz.mytang0.brook.spi.queue.QueueService; import org.apache.commons.collections4.CollectionUtils; import java.util.ArrayList; diff --git a/brook-core/src/main/java/org/mytang/brook/core/queue/QueueProperties.java b/brook-core/src/main/java/xyz/mytang0/brook/core/queue/QueueProperties.java similarity index 68% rename from brook-core/src/main/java/org/mytang/brook/core/queue/QueueProperties.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/queue/QueueProperties.java index 9b92a85..c200319 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/queue/QueueProperties.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/queue/QueueProperties.java @@ -1,7 +1,7 @@ -package org.mytang.brook.core.queue; +package xyz.mytang0.brook.core.queue; import lombok.Data; -import org.mytang.brook.core.constants.FlowConstants; +import xyz.mytang0.brook.core.constants.FlowConstants; @Data public class QueueProperties { diff --git a/brook-core/src/main/java/org/mytang/brook/core/service/FlowLogService.java b/brook-core/src/main/java/xyz/mytang0/brook/core/service/FlowLogService.java similarity index 92% rename from brook-core/src/main/java/org/mytang/brook/core/service/FlowLogService.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/service/FlowLogService.java index 884fd45..932ddf8 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/service/FlowLogService.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/service/FlowLogService.java @@ -1,4 +1,4 @@ -package org.mytang.brook.core.service; +package xyz.mytang0.brook.core.service; import lombok.Data; import org.apache.commons.lang3.StringUtils; @@ -6,7 +6,7 @@ import java.nio.file.Paths; -import static org.mytang.brook.common.constants.Delimiter.EMPTY; +import static xyz.mytang0.brook.common.constants.Delimiter.EMPTY; public class FlowLogService { diff --git a/brook-core/src/main/java/org/mytang/brook/core/tasks/ComputingTask.java b/brook-core/src/main/java/xyz/mytang0/brook/core/tasks/ComputingTask.java similarity index 82% rename from brook-core/src/main/java/org/mytang/brook/core/tasks/ComputingTask.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/tasks/ComputingTask.java index 8b765f1..b421f61 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/tasks/ComputingTask.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/tasks/ComputingTask.java @@ -1,17 +1,17 @@ -package org.mytang.brook.core.tasks; - -import org.mytang.brook.common.configuration.ConfigOption; -import org.mytang.brook.common.configuration.ConfigOptions; -import org.mytang.brook.common.configuration.Configuration; -import org.mytang.brook.common.context.FlowContext; -import org.mytang.brook.common.extension.ExtensionDirector; -import org.mytang.brook.common.metadata.enums.TaskStatus; -import org.mytang.brook.common.metadata.instance.TaskInstance; -import org.mytang.brook.common.utils.StringUtils; -import org.mytang.brook.spi.computing.EngineActuator; -import org.mytang.brook.spi.oss.OSSStorage; -import org.mytang.brook.spi.task.FlowTask; -import org.mytang.brook.core.utils.ParameterUtils; +package xyz.mytang0.brook.core.tasks; + +import xyz.mytang0.brook.common.configuration.ConfigOption; +import xyz.mytang0.brook.common.configuration.ConfigOptions; +import xyz.mytang0.brook.common.configuration.Configuration; +import xyz.mytang0.brook.common.context.FlowContext; +import xyz.mytang0.brook.common.extension.ExtensionDirector; +import xyz.mytang0.brook.common.metadata.enums.TaskStatus; +import xyz.mytang0.brook.common.metadata.instance.TaskInstance; +import xyz.mytang0.brook.common.utils.StringUtils; +import xyz.mytang0.brook.spi.computing.EngineActuator; +import xyz.mytang0.brook.spi.oss.OSSStorage; +import xyz.mytang0.brook.spi.task.FlowTask; +import xyz.mytang0.brook.core.utils.ParameterUtils; import java.util.HashSet; import java.util.Map; diff --git a/brook-core/src/main/java/org/mytang/brook/core/tasks/IFTask.java b/brook-core/src/main/java/xyz/mytang0/brook/core/tasks/IFTask.java similarity index 90% rename from brook-core/src/main/java/org/mytang/brook/core/tasks/IFTask.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/tasks/IFTask.java index e444172..3fb94ab 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/tasks/IFTask.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/tasks/IFTask.java @@ -1,25 +1,25 @@ -package org.mytang.brook.core.tasks; - -import org.mytang.brook.common.configuration.ConfigOption; -import org.mytang.brook.common.configuration.ConfigOptions; -import org.mytang.brook.common.configuration.Configuration; -import org.mytang.brook.common.context.FlowContext; -import org.mytang.brook.common.context.TaskMapperContext; -import org.mytang.brook.common.extension.ExtensionDirector; -import org.mytang.brook.common.metadata.definition.TaskDef; -import org.mytang.brook.common.metadata.enums.TaskStatus; -import org.mytang.brook.common.metadata.instance.FlowInstance; -import org.mytang.brook.common.metadata.instance.TaskInstance; -import org.mytang.brook.common.utils.JsonUtils; -import org.mytang.brook.core.FlowExecutor; -import org.mytang.brook.spi.computing.EngineActuator; -import org.mytang.brook.spi.task.FlowTask; +package xyz.mytang0.brook.core.tasks; + +import xyz.mytang0.brook.common.configuration.ConfigOption; +import xyz.mytang0.brook.common.configuration.ConfigOptions; +import xyz.mytang0.brook.common.configuration.Configuration; +import xyz.mytang0.brook.common.context.FlowContext; +import xyz.mytang0.brook.common.context.TaskMapperContext; +import xyz.mytang0.brook.common.extension.ExtensionDirector; +import xyz.mytang0.brook.common.metadata.definition.TaskDef; +import xyz.mytang0.brook.common.metadata.enums.TaskStatus; +import xyz.mytang0.brook.common.metadata.instance.FlowInstance; +import xyz.mytang0.brook.common.metadata.instance.TaskInstance; +import xyz.mytang0.brook.common.utils.JsonUtils; +import xyz.mytang0.brook.core.FlowExecutor; +import xyz.mytang0.brook.spi.computing.EngineActuator; +import xyz.mytang0.brook.spi.task.FlowTask; import com.fasterxml.jackson.core.type.TypeReference; import lombok.Data; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; -import org.mytang.brook.core.utils.ParameterUtils; +import xyz.mytang0.brook.core.utils.ParameterUtils; import java.io.Serializable; import java.util.ArrayList; diff --git a/brook-core/src/main/java/org/mytang/brook/core/tasks/SubFlowTask.java b/brook-core/src/main/java/xyz/mytang0/brook/core/tasks/SubFlowTask.java similarity index 85% rename from brook-core/src/main/java/org/mytang/brook/core/tasks/SubFlowTask.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/tasks/SubFlowTask.java index 65a8a46..fc3f351 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/tasks/SubFlowTask.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/tasks/SubFlowTask.java @@ -1,17 +1,17 @@ -package org.mytang.brook.core.tasks; - -import org.mytang.brook.common.configuration.ConfigOption; -import org.mytang.brook.common.configuration.ConfigOptions; -import org.mytang.brook.common.configuration.Configuration; -import org.mytang.brook.common.context.FlowContext; -import org.mytang.brook.common.holder.UserHolder; -import org.mytang.brook.common.metadata.extension.Extension; -import org.mytang.brook.common.metadata.instance.FlowInstance; -import org.mytang.brook.common.metadata.instance.TaskInstance; -import org.mytang.brook.common.metadata.model.StartFlowReq; -import org.mytang.brook.common.metadata.model.User; -import org.mytang.brook.core.FlowExecutor; -import org.mytang.brook.spi.task.FlowTask; +package xyz.mytang0.brook.core.tasks; + +import xyz.mytang0.brook.common.configuration.ConfigOption; +import xyz.mytang0.brook.common.configuration.ConfigOptions; +import xyz.mytang0.brook.common.configuration.Configuration; +import xyz.mytang0.brook.common.context.FlowContext; +import xyz.mytang0.brook.common.holder.UserHolder; +import xyz.mytang0.brook.common.metadata.extension.Extension; +import xyz.mytang0.brook.common.metadata.instance.FlowInstance; +import xyz.mytang0.brook.common.metadata.instance.TaskInstance; +import xyz.mytang0.brook.common.metadata.model.StartFlowReq; +import xyz.mytang0.brook.common.metadata.model.User; +import xyz.mytang0.brook.core.FlowExecutor; +import xyz.mytang0.brook.spi.task.FlowTask; import org.apache.commons.lang3.StringUtils; import java.util.HashSet; diff --git a/brook-core/src/main/java/org/mytang/brook/core/tasks/SwitchTask.java b/brook-core/src/main/java/xyz/mytang0/brook/core/tasks/SwitchTask.java similarity index 91% rename from brook-core/src/main/java/org/mytang/brook/core/tasks/SwitchTask.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/tasks/SwitchTask.java index 798f21e..80980ce 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/tasks/SwitchTask.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/tasks/SwitchTask.java @@ -1,24 +1,24 @@ -package org.mytang.brook.core.tasks; - -import org.mytang.brook.common.extension.ExtensionDirector; -import org.mytang.brook.common.utils.JsonUtils; -import org.mytang.brook.core.FlowExecutor; -import org.mytang.brook.spi.task.FlowTask; -import org.mytang.brook.common.configuration.ConfigOption; -import org.mytang.brook.common.configuration.ConfigOptions; -import org.mytang.brook.common.configuration.Configuration; -import org.mytang.brook.common.context.FlowContext; -import org.mytang.brook.common.context.TaskMapperContext; -import org.mytang.brook.common.metadata.definition.TaskDef; -import org.mytang.brook.spi.computing.EngineActuator; -import org.mytang.brook.common.metadata.enums.TaskStatus; -import org.mytang.brook.common.metadata.instance.FlowInstance; -import org.mytang.brook.common.metadata.instance.TaskInstance; +package xyz.mytang0.brook.core.tasks; + +import xyz.mytang0.brook.common.extension.ExtensionDirector; +import xyz.mytang0.brook.common.utils.JsonUtils; +import xyz.mytang0.brook.core.FlowExecutor; +import xyz.mytang0.brook.spi.task.FlowTask; +import xyz.mytang0.brook.common.configuration.ConfigOption; +import xyz.mytang0.brook.common.configuration.ConfigOptions; +import xyz.mytang0.brook.common.configuration.Configuration; +import xyz.mytang0.brook.common.context.FlowContext; +import xyz.mytang0.brook.common.context.TaskMapperContext; +import xyz.mytang0.brook.common.metadata.definition.TaskDef; +import xyz.mytang0.brook.spi.computing.EngineActuator; +import xyz.mytang0.brook.common.metadata.enums.TaskStatus; +import xyz.mytang0.brook.common.metadata.instance.FlowInstance; +import xyz.mytang0.brook.common.metadata.instance.TaskInstance; import com.fasterxml.jackson.core.type.TypeReference; import lombok.Data; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.mytang.brook.core.utils.ParameterUtils; +import xyz.mytang0.brook.core.utils.ParameterUtils; import java.io.Serializable; import java.util.ArrayList; diff --git a/brook-core/src/main/java/org/mytang/brook/core/tasks/WaitTask.java b/brook-core/src/main/java/xyz/mytang0/brook/core/tasks/WaitTask.java similarity index 65% rename from brook-core/src/main/java/org/mytang/brook/core/tasks/WaitTask.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/tasks/WaitTask.java index d2360c8..1fde765 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/tasks/WaitTask.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/tasks/WaitTask.java @@ -1,9 +1,9 @@ -package org.mytang.brook.core.tasks; +package xyz.mytang0.brook.core.tasks; -import org.mytang.brook.common.configuration.ConfigOption; -import org.mytang.brook.common.configuration.ConfigOptions; -import org.mytang.brook.common.metadata.instance.TaskInstance; -import org.mytang.brook.spi.task.FlowTask; +import xyz.mytang0.brook.common.configuration.ConfigOption; +import xyz.mytang0.brook.common.configuration.ConfigOptions; +import xyz.mytang0.brook.common.metadata.instance.TaskInstance; +import xyz.mytang0.brook.spi.task.FlowTask; import java.util.Map; diff --git a/brook-core/src/main/java/org/mytang/brook/core/utils/ParameterUtils.java b/brook-core/src/main/java/xyz/mytang0/brook/core/utils/ParameterUtils.java similarity index 97% rename from brook-core/src/main/java/org/mytang/brook/core/utils/ParameterUtils.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/utils/ParameterUtils.java index 2ea9417..44e3d14 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/utils/ParameterUtils.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/utils/ParameterUtils.java @@ -1,13 +1,13 @@ -package org.mytang.brook.core.utils; - -import org.mytang.brook.common.constants.Delimiter; -import org.mytang.brook.common.metadata.definition.FlowDef; -import org.mytang.brook.common.metadata.definition.TaskDef; -import org.mytang.brook.common.metadata.extension.Extension; -import org.mytang.brook.common.metadata.instance.FlowInstance; -import org.mytang.brook.common.metadata.instance.TaskInstance; -import org.mytang.brook.common.utils.JsonUtils; -import org.mytang.brook.core.constants.FlowConstants; +package xyz.mytang0.brook.core.utils; + +import xyz.mytang0.brook.common.constants.Delimiter; +import xyz.mytang0.brook.common.metadata.definition.FlowDef; +import xyz.mytang0.brook.common.metadata.definition.TaskDef; +import xyz.mytang0.brook.common.metadata.extension.Extension; +import xyz.mytang0.brook.common.metadata.instance.FlowInstance; +import xyz.mytang0.brook.common.metadata.instance.TaskInstance; +import xyz.mytang0.brook.common.utils.JsonUtils; +import xyz.mytang0.brook.core.constants.FlowConstants; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectReader; diff --git a/brook-core/src/main/java/org/mytang/brook/core/utils/QueueUtils.java b/brook-core/src/main/java/xyz/mytang0/brook/core/utils/QueueUtils.java similarity index 91% rename from brook-core/src/main/java/org/mytang/brook/core/utils/QueueUtils.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/utils/QueueUtils.java index a501d4c..8f61ee5 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/utils/QueueUtils.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/utils/QueueUtils.java @@ -1,6 +1,6 @@ -package org.mytang.brook.core.utils; +package xyz.mytang0.brook.core.utils; -import org.mytang.brook.common.constants.Delimiter; +import xyz.mytang0.brook.common.constants.Delimiter; import org.apache.commons.lang3.StringUtils; import java.util.Optional; diff --git a/brook-core/src/main/java/org/mytang/brook/core/utils/ThreadUtils.java b/brook-core/src/main/java/xyz/mytang0/brook/core/utils/ThreadUtils.java similarity index 98% rename from brook-core/src/main/java/org/mytang/brook/core/utils/ThreadUtils.java rename to brook-core/src/main/java/xyz/mytang0/brook/core/utils/ThreadUtils.java index 8a3e194..83971ac 100644 --- a/brook-core/src/main/java/org/mytang/brook/core/utils/ThreadUtils.java +++ b/brook-core/src/main/java/xyz/mytang0/brook/core/utils/ThreadUtils.java @@ -1,4 +1,4 @@ -package org.mytang.brook.core.utils; +package xyz.mytang0.brook.core.utils; import com.google.common.util.concurrent.ThreadFactoryBuilder; diff --git a/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.cache.FlowCache b/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.cache.FlowCache deleted file mode 100644 index e9b16a8..0000000 --- a/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.cache.FlowCache +++ /dev/null @@ -1 +0,0 @@ -default=org.mytang.brook.core.cache.DefaultFlowCache \ No newline at end of file diff --git a/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.cache.FlowCacheFactory b/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.cache.FlowCacheFactory deleted file mode 100644 index 50a783e..0000000 --- a/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.cache.FlowCacheFactory +++ /dev/null @@ -1 +0,0 @@ -default=org.mytang.brook.core.cache.DefaultFlowCacheFactory \ No newline at end of file diff --git a/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.callback.TaskCallback b/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.callback.TaskCallback deleted file mode 100644 index 333950c..0000000 --- a/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.callback.TaskCallback +++ /dev/null @@ -1 +0,0 @@ -default=org.mytang.brook.core.callback.DefaultClassTaskCallback \ No newline at end of file diff --git a/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.computing.Engine b/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.computing.Engine deleted file mode 100644 index f29b722..0000000 --- a/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.computing.Engine +++ /dev/null @@ -1,2 +0,0 @@ -noop=org.mytang.brook.core.computing.NoopEngine -javascript=org.mytang.brook.core.computing.JavascriptEngine \ No newline at end of file diff --git a/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.computing.EngineActuator b/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.computing.EngineActuator deleted file mode 100644 index 6fc125c..0000000 --- a/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.computing.EngineActuator +++ /dev/null @@ -1 +0,0 @@ -default=org.mytang.brook.core.computing.DefaultEngineActuator \ No newline at end of file diff --git a/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.execution.ExecutionDAO b/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.execution.ExecutionDAO deleted file mode 100644 index ab2ac74..0000000 --- a/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.execution.ExecutionDAO +++ /dev/null @@ -1 +0,0 @@ -local=org.mytang.brook.core.execution.LocalExecutionDAO \ No newline at end of file diff --git a/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.executor.ExecutorFactory b/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.executor.ExecutorFactory deleted file mode 100644 index 02f8858..0000000 --- a/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.executor.ExecutorFactory +++ /dev/null @@ -1 +0,0 @@ -default=org.mytang.brook.core.executor.DefaultExecutorFactory \ No newline at end of file diff --git a/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.lock.LockService b/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.lock.LockService deleted file mode 100644 index d45e996..0000000 --- a/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.lock.LockService +++ /dev/null @@ -1 +0,0 @@ -local=org.mytang.brook.core.lock.support.LocalLockService \ No newline at end of file diff --git a/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.metadata.MetadataService b/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.metadata.MetadataService deleted file mode 100644 index 68a0934..0000000 --- a/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.metadata.MetadataService +++ /dev/null @@ -1 +0,0 @@ -file=org.mytang.brook.core.metadata.FileMetadataService \ No newline at end of file diff --git a/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.queue.QueueService b/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.queue.QueueService deleted file mode 100644 index a4eff4b..0000000 --- a/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.queue.QueueService +++ /dev/null @@ -1 +0,0 @@ -local=org.mytang.brook.core.queue.LocalQueueService \ No newline at end of file diff --git a/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.task.FlowTask b/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.task.FlowTask deleted file mode 100644 index 0649995..0000000 --- a/brook-core/src/main/resources/META-INF/brook/org.mytang.brook.spi.task.FlowTask +++ /dev/null @@ -1,5 +0,0 @@ -IF=org.mytang.brook.core.tasks.IFTask -SWITCH=org.mytang.brook.core.tasks.SwitchTask -SUB_FLOW=org.mytang.brook.core.tasks.SubFlowTask -COMPUTING=org.mytang.brook.core.tasks.ComputingTask -WAIT=org.mytang.brook.core.tasks.WaitTask \ No newline at end of file diff --git a/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.cache.FlowCache b/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.cache.FlowCache new file mode 100644 index 0000000..9bf87d6 --- /dev/null +++ b/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.cache.FlowCache @@ -0,0 +1 @@ +default=xyz.mytang0.brook.core.cache.DefaultFlowCache \ No newline at end of file diff --git a/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.cache.FlowCacheFactory b/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.cache.FlowCacheFactory new file mode 100644 index 0000000..cf907c1 --- /dev/null +++ b/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.cache.FlowCacheFactory @@ -0,0 +1 @@ +default=xyz.mytang0.brook.core.cache.DefaultFlowCacheFactory \ No newline at end of file diff --git a/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.callback.TaskCallback b/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.callback.TaskCallback new file mode 100644 index 0000000..4090593 --- /dev/null +++ b/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.callback.TaskCallback @@ -0,0 +1 @@ +default=xyz.mytang0.brook.core.callback.DefaultClassTaskCallback \ No newline at end of file diff --git a/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.computing.Engine b/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.computing.Engine new file mode 100644 index 0000000..9b330d1 --- /dev/null +++ b/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.computing.Engine @@ -0,0 +1,2 @@ +noop=xyz.mytang0.brook.core.computing.NoopEngine +javascript=xyz.mytang0.brook.core.computing.JavascriptEngine \ No newline at end of file diff --git a/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.computing.EngineActuator b/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.computing.EngineActuator new file mode 100644 index 0000000..c3d2827 --- /dev/null +++ b/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.computing.EngineActuator @@ -0,0 +1 @@ +default=xyz.mytang0.brook.core.computing.DefaultEngineActuator \ No newline at end of file diff --git a/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.execution.ExecutionDAO b/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.execution.ExecutionDAO new file mode 100644 index 0000000..e073e35 --- /dev/null +++ b/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.execution.ExecutionDAO @@ -0,0 +1 @@ +local=xyz.mytang0.brook.core.execution.LocalExecutionDAO \ No newline at end of file diff --git a/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.executor.ExecutorFactory b/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.executor.ExecutorFactory new file mode 100644 index 0000000..e30edb1 --- /dev/null +++ b/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.executor.ExecutorFactory @@ -0,0 +1 @@ +default=xyz.mytang0.brook.core.executor.DefaultExecutorFactory \ No newline at end of file diff --git a/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.lock.LockService b/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.lock.LockService new file mode 100644 index 0000000..ad7a055 --- /dev/null +++ b/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.lock.LockService @@ -0,0 +1 @@ +local=xyz.mytang0.brook.core.lock.support.LocalLockService \ No newline at end of file diff --git a/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.metadata.MetadataService b/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.metadata.MetadataService new file mode 100644 index 0000000..b8a8e36 --- /dev/null +++ b/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.metadata.MetadataService @@ -0,0 +1 @@ +file=xyz.mytang0.brook.core.metadata.FileMetadataService \ No newline at end of file diff --git a/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.queue.QueueService b/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.queue.QueueService new file mode 100644 index 0000000..489ff57 --- /dev/null +++ b/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.queue.QueueService @@ -0,0 +1 @@ +local=xyz.mytang0.brook.core.queue.LocalQueueService \ No newline at end of file diff --git a/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.task.FlowTask b/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.task.FlowTask new file mode 100644 index 0000000..4de7d01 --- /dev/null +++ b/brook-core/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.task.FlowTask @@ -0,0 +1,5 @@ +IF=xyz.mytang0.brook.core.tasks.IFTask +SWITCH=xyz.mytang0.brook.core.tasks.SwitchTask +SUB_FLOW=xyz.mytang0.brook.core.tasks.SubFlowTask +COMPUTING=xyz.mytang0.brook.core.tasks.ComputingTask +WAIT=xyz.mytang0.brook.core.tasks.WaitTask \ No newline at end of file diff --git a/brook-core/src/test/java/org/mytang/brook/core/lock/support/FlowLockFacadeTest.java b/brook-core/src/test/java/xyz/mytang0/brook/core/lock/support/FlowLockFacadeTest.java similarity index 93% rename from brook-core/src/test/java/org/mytang/brook/core/lock/support/FlowLockFacadeTest.java rename to brook-core/src/test/java/xyz/mytang0/brook/core/lock/support/FlowLockFacadeTest.java index 80fe55d..81a9a5c 100644 --- a/brook-core/src/test/java/org/mytang/brook/core/lock/support/FlowLockFacadeTest.java +++ b/brook-core/src/test/java/xyz/mytang0/brook/core/lock/support/FlowLockFacadeTest.java @@ -1,7 +1,7 @@ -package org.mytang.brook.core.lock.support; +package xyz.mytang0.brook.core.lock.support; -import org.mytang.brook.core.lock.FlowLockFacade; -import org.mytang.brook.core.lock.LockProperties; +import xyz.mytang0.brook.core.lock.FlowLockFacade; +import xyz.mytang0.brook.core.lock.LockProperties; import org.junit.Assert; import org.junit.Test; diff --git a/brook-demo/brook-demo-spring/pom.xml b/brook-demo/brook-demo-spring/pom.xml index 01f509a..9e4b26f 100644 --- a/brook-demo/brook-demo-spring/pom.xml +++ b/brook-demo/brook-demo-spring/pom.xml @@ -4,13 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.mytang.brook + xyz.mytang0.brook brook-demo ${revision} ../pom.xml - org.mytang.brook.demo + xyz.mytang0.brook.demo brook-demo-spring ${revision} @@ -50,14 +50,14 @@ - org.mytang.brook + xyz.mytang0.brook brook-spring-boot-starter ${brook.version} - org.mytang.brook + xyz.mytang0.brook brook-task-http ${brook.version} diff --git a/brook-demo/brook-demo-spring/src/main/java/org/mytang/brook/demo/DemoApplication.java b/brook-demo/brook-demo-spring/src/main/java/xyz/mytang0/brook/demo/DemoApplication.java similarity index 89% rename from brook-demo/brook-demo-spring/src/main/java/org/mytang/brook/demo/DemoApplication.java rename to brook-demo/brook-demo-spring/src/main/java/xyz/mytang0/brook/demo/DemoApplication.java index f3e939d..52ebb59 100644 --- a/brook-demo/brook-demo-spring/src/main/java/org/mytang/brook/demo/DemoApplication.java +++ b/brook-demo/brook-demo-spring/src/main/java/xyz/mytang0/brook/demo/DemoApplication.java @@ -1,4 +1,4 @@ -package org.mytang.brook.demo; +package xyz.mytang0.brook.demo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/brook-demo/brook-demo-spring/src/main/java/org/mytang/brook/demo/callback/DemoCallback.java b/brook-demo/brook-demo-spring/src/main/java/xyz/mytang0/brook/demo/callback/DemoCallback.java similarity index 76% rename from brook-demo/brook-demo-spring/src/main/java/org/mytang/brook/demo/callback/DemoCallback.java rename to brook-demo/brook-demo-spring/src/main/java/xyz/mytang0/brook/demo/callback/DemoCallback.java index 3385454..22087c6 100644 --- a/brook-demo/brook-demo-spring/src/main/java/org/mytang/brook/demo/callback/DemoCallback.java +++ b/brook-demo/brook-demo-spring/src/main/java/xyz/mytang0/brook/demo/callback/DemoCallback.java @@ -1,7 +1,7 @@ -package org.mytang.brook.demo.callback; +package xyz.mytang0.brook.demo.callback; -import org.mytang.brook.common.metadata.instance.TaskInstance; -import org.mytang.brook.spi.callback.ClassTaskCallback; +import xyz.mytang0.brook.common.metadata.instance.TaskInstance; +import xyz.mytang0.brook.spi.callback.ClassTaskCallback; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/brook-demo/brook-demo-spring/src/main/java/org/mytang/brook/demo/controller/FlowHangController.java b/brook-demo/brook-demo-spring/src/main/java/xyz/mytang0/brook/demo/controller/FlowHangController.java similarity index 96% rename from brook-demo/brook-demo-spring/src/main/java/org/mytang/brook/demo/controller/FlowHangController.java rename to brook-demo/brook-demo-spring/src/main/java/xyz/mytang0/brook/demo/controller/FlowHangController.java index 98a2e96..cacdc12 100644 --- a/brook-demo/brook-demo-spring/src/main/java/org/mytang/brook/demo/controller/FlowHangController.java +++ b/brook-demo/brook-demo-spring/src/main/java/xyz/mytang0/brook/demo/controller/FlowHangController.java @@ -1,4 +1,4 @@ -package org.mytang.brook.demo.controller; +package xyz.mytang0.brook.demo.controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/brook-demo/brook-demo-spring/src/main/java/org/mytang/brook/demo/controller/FlowInstanceController.java b/brook-demo/brook-demo-spring/src/main/java/xyz/mytang0/brook/demo/controller/FlowInstanceController.java similarity index 87% rename from brook-demo/brook-demo-spring/src/main/java/org/mytang/brook/demo/controller/FlowInstanceController.java rename to brook-demo/brook-demo-spring/src/main/java/xyz/mytang0/brook/demo/controller/FlowInstanceController.java index a6d2d82..746cd39 100644 --- a/brook-demo/brook-demo-spring/src/main/java/org/mytang/brook/demo/controller/FlowInstanceController.java +++ b/brook-demo/brook-demo-spring/src/main/java/xyz/mytang0/brook/demo/controller/FlowInstanceController.java @@ -1,9 +1,9 @@ -package org.mytang.brook.demo.controller; +package xyz.mytang0.brook.demo.controller; -import org.mytang.brook.common.metadata.instance.FlowInstance; -import org.mytang.brook.common.metadata.model.StartFlowReq; -import org.mytang.brook.common.metadata.model.TaskResult; -import org.mytang.brook.core.FlowExecutor; +import xyz.mytang0.brook.common.metadata.instance.FlowInstance; +import xyz.mytang0.brook.common.metadata.model.StartFlowReq; +import xyz.mytang0.brook.common.metadata.model.TaskResult; +import xyz.mytang0.brook.core.FlowExecutor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; diff --git a/brook-demo/brook-demo-spring/src/main/java/org/mytang/brook/demo/controller/FlowMetadataController.java b/brook-demo/brook-demo-spring/src/main/java/xyz/mytang0/brook/demo/controller/FlowMetadataController.java similarity index 86% rename from brook-demo/brook-demo-spring/src/main/java/org/mytang/brook/demo/controller/FlowMetadataController.java rename to brook-demo/brook-demo-spring/src/main/java/xyz/mytang0/brook/demo/controller/FlowMetadataController.java index dc1dc0c..8417303 100644 --- a/brook-demo/brook-demo-spring/src/main/java/org/mytang/brook/demo/controller/FlowMetadataController.java +++ b/brook-demo/brook-demo-spring/src/main/java/xyz/mytang0/brook/demo/controller/FlowMetadataController.java @@ -1,8 +1,8 @@ -package org.mytang.brook.demo.controller; +package xyz.mytang0.brook.demo.controller; -import org.mytang.brook.common.metadata.definition.FlowDef; -import org.mytang.brook.core.metadata.MetadataFacade; -import org.mytang.brook.core.metadata.MetadataProperties; +import xyz.mytang0.brook.common.metadata.definition.FlowDef; +import xyz.mytang0.brook.core.metadata.MetadataFacade; +import xyz.mytang0.brook.core.metadata.MetadataProperties; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/brook-demo/brook-demo-spring/src/main/java/org/mytang/brook/demo/litener/DemoFlowListener.java b/brook-demo/brook-demo-spring/src/main/java/xyz/mytang0/brook/demo/litener/DemoFlowListener.java similarity index 85% rename from brook-demo/brook-demo-spring/src/main/java/org/mytang/brook/demo/litener/DemoFlowListener.java rename to brook-demo/brook-demo-spring/src/main/java/xyz/mytang0/brook/demo/litener/DemoFlowListener.java index 2094159..4f8d0ec 100644 --- a/brook-demo/brook-demo-spring/src/main/java/org/mytang/brook/demo/litener/DemoFlowListener.java +++ b/brook-demo/brook-demo-spring/src/main/java/xyz/mytang0/brook/demo/litener/DemoFlowListener.java @@ -1,8 +1,8 @@ -package org.mytang.brook.demo.litener; +package xyz.mytang0.brook.demo.litener; -import org.mytang.brook.common.metadata.enums.TaskStatus; -import org.mytang.brook.common.metadata.instance.FlowInstance; -import org.mytang.brook.spi.listener.FlowListener; +import xyz.mytang0.brook.common.metadata.enums.TaskStatus; +import xyz.mytang0.brook.common.metadata.instance.FlowInstance; +import xyz.mytang0.brook.spi.listener.FlowListener; import lombok.AllArgsConstructor; import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/brook-demo/brook-demo-spring/src/main/java/org/mytang/brook/demo/litener/DemoTaskListener.java b/brook-demo/brook-demo-spring/src/main/java/xyz/mytang0/brook/demo/litener/DemoTaskListener.java similarity index 80% rename from brook-demo/brook-demo-spring/src/main/java/org/mytang/brook/demo/litener/DemoTaskListener.java rename to brook-demo/brook-demo-spring/src/main/java/xyz/mytang0/brook/demo/litener/DemoTaskListener.java index a5c0d50..fc9b389 100644 --- a/brook-demo/brook-demo-spring/src/main/java/org/mytang/brook/demo/litener/DemoTaskListener.java +++ b/brook-demo/brook-demo-spring/src/main/java/xyz/mytang0/brook/demo/litener/DemoTaskListener.java @@ -1,7 +1,7 @@ -package org.mytang.brook.demo.litener; +package xyz.mytang0.brook.demo.litener; -import org.mytang.brook.common.metadata.instance.TaskInstance; -import org.mytang.brook.spi.listener.TaskListener; +import xyz.mytang0.brook.common.metadata.instance.TaskInstance; +import xyz.mytang0.brook.spi.listener.TaskListener; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/brook-demo/brook-demo-spring/src/main/java/org/mytang/brook/demo/service/DemoService.java b/brook-demo/brook-demo-spring/src/main/java/xyz/mytang0/brook/demo/service/DemoService.java similarity index 88% rename from brook-demo/brook-demo-spring/src/main/java/org/mytang/brook/demo/service/DemoService.java rename to brook-demo/brook-demo-spring/src/main/java/xyz/mytang0/brook/demo/service/DemoService.java index 7aca9aa..4fb35e5 100644 --- a/brook-demo/brook-demo-spring/src/main/java/org/mytang/brook/demo/service/DemoService.java +++ b/brook-demo/brook-demo-spring/src/main/java/xyz/mytang0/brook/demo/service/DemoService.java @@ -1,8 +1,8 @@ -package org.mytang.brook.demo.service; +package xyz.mytang0.brook.demo.service; -import org.mytang.brook.common.utils.JsonUtils; -import org.mytang.brook.common.utils.TimeUtils; -import org.mytang.brook.spring.boot.annotation.Taskable; +import xyz.mytang0.brook.common.utils.JsonUtils; +import xyz.mytang0.brook.common.utils.TimeUtils; +import xyz.mytang0.brook.spring.boot.annotation.Taskable; import org.springframework.stereotype.Component; import java.util.List; diff --git a/brook-demo/pom.xml b/brook-demo/pom.xml index 3889f53..e653935 100644 --- a/brook-demo/pom.xml +++ b/brook-demo/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.mytang.brook + xyz.mytang0.brook brook-parent ${revision} ../pom.xml diff --git a/brook-engine/pom.xml b/brook-engine/pom.xml index 364924a..4956b17 100644 --- a/brook-engine/pom.xml +++ b/brook-engine/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.mytang.brook + xyz.mytang0.brook brook-parent ${revision} ../pom.xml @@ -16,7 +16,7 @@ - org.mytang.brook + xyz.mytang0.brook brook-core ${project.version} diff --git a/brook-spi-extensions/brook-computing-extensions/pom.xml b/brook-spi-extensions/brook-computing-extensions/pom.xml index 92658e9..b47396d 100644 --- a/brook-spi-extensions/brook-computing-extensions/pom.xml +++ b/brook-spi-extensions/brook-computing-extensions/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.mytang.brook + xyz.mytang0.brook brook-spi-extensions ${revision} ../pom.xml diff --git a/brook-spi-extensions/brook-lock-extensions/brook-lock-redis/pom.xml b/brook-spi-extensions/brook-lock-extensions/brook-lock-redis/pom.xml index 04860f3..0fa13a0 100644 --- a/brook-spi-extensions/brook-lock-extensions/brook-lock-redis/pom.xml +++ b/brook-spi-extensions/brook-lock-extensions/brook-lock-redis/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.mytang.brook + xyz.mytang0.brook brook-lock-extensions ${revision} ../pom.xml @@ -20,7 +20,7 @@ - org.mytang.brook + xyz.mytang0.brook brook-spi diff --git a/brook-spi-extensions/brook-lock-extensions/brook-lock-redis/src/main/java/org/mytang/brook/lock/redis/RedisLockService.java b/brook-spi-extensions/brook-lock-extensions/brook-lock-redis/src/main/java/xyz/mytang0/brook/lock/redis/RedisLockService.java similarity index 92% rename from brook-spi-extensions/brook-lock-extensions/brook-lock-redis/src/main/java/org/mytang/brook/lock/redis/RedisLockService.java rename to brook-spi-extensions/brook-lock-extensions/brook-lock-redis/src/main/java/xyz/mytang0/brook/lock/redis/RedisLockService.java index 499198c..765d494 100644 --- a/brook-spi-extensions/brook-lock-extensions/brook-lock-redis/src/main/java/org/mytang/brook/lock/redis/RedisLockService.java +++ b/brook-spi-extensions/brook-lock-extensions/brook-lock-redis/src/main/java/xyz/mytang0/brook/lock/redis/RedisLockService.java @@ -1,8 +1,8 @@ -package org.mytang.brook.lock.redis; +package xyz.mytang0.brook.lock.redis; -import org.mytang.brook.common.extension.Disposable; -import org.mytang.brook.spi.annotation.FlowSPI; -import org.mytang.brook.spi.lock.LockService; +import xyz.mytang0.brook.common.extension.Disposable; +import xyz.mytang0.brook.spi.annotation.FlowSPI; +import xyz.mytang0.brook.spi.lock.LockService; import lombok.extern.slf4j.Slf4j; import org.redisson.Redisson; import org.redisson.api.RLock; diff --git a/brook-spi-extensions/brook-lock-extensions/brook-lock-redis/src/main/resources/META-INF/brook/org.mytang.brook.spi.lock.LockService b/brook-spi-extensions/brook-lock-extensions/brook-lock-redis/src/main/resources/META-INF/brook/org.mytang.brook.spi.lock.LockService deleted file mode 100644 index 44460ec..0000000 --- a/brook-spi-extensions/brook-lock-extensions/brook-lock-redis/src/main/resources/META-INF/brook/org.mytang.brook.spi.lock.LockService +++ /dev/null @@ -1 +0,0 @@ -#redis=org.mytang.brook.lock.redis.RedisLockService \ No newline at end of file diff --git a/brook-spi-extensions/brook-lock-extensions/brook-lock-redis/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.lock.LockService b/brook-spi-extensions/brook-lock-extensions/brook-lock-redis/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.lock.LockService new file mode 100644 index 0000000..a0c56d3 --- /dev/null +++ b/brook-spi-extensions/brook-lock-extensions/brook-lock-redis/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.lock.LockService @@ -0,0 +1 @@ +#redis=xyz.mytang0.brook.lock.redis.RedisLockService \ No newline at end of file diff --git a/brook-spi-extensions/brook-lock-extensions/pom.xml b/brook-spi-extensions/brook-lock-extensions/pom.xml index 4a591cf..0b30405 100644 --- a/brook-spi-extensions/brook-lock-extensions/pom.xml +++ b/brook-spi-extensions/brook-lock-extensions/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.mytang.brook + xyz.mytang0.brook brook-spi-extensions ${revision} ../pom.xml diff --git a/brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/pom.xml b/brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/pom.xml index 900be5b..bbc5f56 100644 --- a/brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/pom.xml +++ b/brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.mytang.brook + xyz.mytang0.brook brook-metadata-extensions ${revision} ../pom.xml @@ -20,7 +20,7 @@ - org.mytang.brook + xyz.mytang0.brook brook-spi diff --git a/brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/src/main/java/org/mytang/brook/metadata/http/HTTPMetadataConfig.java b/brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/src/main/java/xyz/mytang0/brook/metadata/http/HTTPMetadataConfig.java similarity index 92% rename from brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/src/main/java/org/mytang/brook/metadata/http/HTTPMetadataConfig.java rename to brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/src/main/java/xyz/mytang0/brook/metadata/http/HTTPMetadataConfig.java index 5f955db..ba7db2e 100644 --- a/brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/src/main/java/org/mytang/brook/metadata/http/HTTPMetadataConfig.java +++ b/brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/src/main/java/xyz/mytang0/brook/metadata/http/HTTPMetadataConfig.java @@ -1,6 +1,6 @@ -package org.mytang.brook.metadata.http; +package xyz.mytang0.brook.metadata.http; -import org.mytang.brook.common.utils.StringUtils; +import xyz.mytang0.brook.common.utils.StringUtils; import lombok.Data; import java.time.Duration; diff --git a/brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/src/main/java/org/mytang/brook/metadata/http/HTTPMetadataService.java b/brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/src/main/java/xyz/mytang0/brook/metadata/http/HTTPMetadataService.java similarity index 95% rename from brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/src/main/java/org/mytang/brook/metadata/http/HTTPMetadataService.java rename to brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/src/main/java/xyz/mytang0/brook/metadata/http/HTTPMetadataService.java index e08e3dd..bbed241 100644 --- a/brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/src/main/java/org/mytang/brook/metadata/http/HTTPMetadataService.java +++ b/brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/src/main/java/xyz/mytang0/brook/metadata/http/HTTPMetadataService.java @@ -1,11 +1,11 @@ -package org.mytang.brook.metadata.http; - -import org.mytang.brook.common.constants.Delimiter; -import org.mytang.brook.common.extension.Disposable; -import org.mytang.brook.common.extension.Selected; -import org.mytang.brook.common.metadata.definition.FlowDef; -import org.mytang.brook.common.utils.JsonUtils; -import org.mytang.brook.spi.metadata.MetadataService; +package xyz.mytang0.brook.metadata.http; + +import xyz.mytang0.brook.common.constants.Delimiter; +import xyz.mytang0.brook.common.extension.Disposable; +import xyz.mytang0.brook.common.extension.Selected; +import xyz.mytang0.brook.common.metadata.definition.FlowDef; +import xyz.mytang0.brook.common.utils.JsonUtils; +import xyz.mytang0.brook.spi.metadata.MetadataService; import com.fasterxml.jackson.core.type.TypeReference; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; diff --git a/brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/src/main/resources/META-INF/brook/org.mytang.brook.spi.metadata.MetadataService b/brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/src/main/resources/META-INF/brook/org.mytang.brook.spi.metadata.MetadataService deleted file mode 100644 index 2461069..0000000 --- a/brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/src/main/resources/META-INF/brook/org.mytang.brook.spi.metadata.MetadataService +++ /dev/null @@ -1 +0,0 @@ -http=org.mytang.brook.metadata.http.HTTPMetadataService \ No newline at end of file diff --git a/brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.metadata.MetadataService b/brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.metadata.MetadataService new file mode 100644 index 0000000..1c5376f --- /dev/null +++ b/brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.metadata.MetadataService @@ -0,0 +1 @@ +http=xyz.mytang0.brook.metadata.http.HTTPMetadataService \ No newline at end of file diff --git a/brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/src/test/java/org/mytang/brook/metadata/http/HTTPMetadataServiceTest.java b/brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/src/test/java/xyz/mytang0/brook/metadata/http/HTTPMetadataServiceTest.java similarity index 89% rename from brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/src/test/java/org/mytang/brook/metadata/http/HTTPMetadataServiceTest.java rename to brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/src/test/java/xyz/mytang0/brook/metadata/http/HTTPMetadataServiceTest.java index aa435e2..a316e41 100644 --- a/brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/src/test/java/org/mytang/brook/metadata/http/HTTPMetadataServiceTest.java +++ b/brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/src/test/java/xyz/mytang0/brook/metadata/http/HTTPMetadataServiceTest.java @@ -1,6 +1,6 @@ -package org.mytang.brook.metadata.http; +package xyz.mytang0.brook.metadata.http; -import org.mytang.brook.common.metadata.definition.FlowDef; +import xyz.mytang0.brook.common.metadata.definition.FlowDef; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/brook-spi-extensions/brook-metadata-extensions/pom.xml b/brook-spi-extensions/brook-metadata-extensions/pom.xml index 1647ef5..5ce717c 100644 --- a/brook-spi-extensions/brook-metadata-extensions/pom.xml +++ b/brook-spi-extensions/brook-metadata-extensions/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.mytang.brook + xyz.mytang0.brook brook-spi-extensions ${revision} ../pom.xml diff --git a/brook-spi-extensions/brook-oss-extensions/brook-oss-s3/pom.xml b/brook-spi-extensions/brook-oss-extensions/brook-oss-s3/pom.xml index b848651..386d700 100644 --- a/brook-spi-extensions/brook-oss-extensions/brook-oss-s3/pom.xml +++ b/brook-spi-extensions/brook-oss-extensions/brook-oss-s3/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.mytang.brook + xyz.mytang0.brook brook-oss-extensions ${revision} ../pom.xml diff --git a/brook-spi-extensions/brook-oss-extensions/pom.xml b/brook-spi-extensions/brook-oss-extensions/pom.xml index 1f4ea77..2fdcd6e 100644 --- a/brook-spi-extensions/brook-oss-extensions/pom.xml +++ b/brook-spi-extensions/brook-oss-extensions/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.mytang.brook + xyz.mytang0.brook brook-spi-extensions ${revision} ../pom.xml diff --git a/brook-spi-extensions/brook-task-extensions/brook-task-http/pom.xml b/brook-spi-extensions/brook-task-extensions/brook-task-http/pom.xml index af0c49b..ecc44bf 100644 --- a/brook-spi-extensions/brook-task-extensions/brook-task-http/pom.xml +++ b/brook-spi-extensions/brook-task-extensions/brook-task-http/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.mytang.brook + xyz.mytang0.brook brook-task-extensions ${revision} ../pom.xml @@ -20,7 +20,7 @@ - org.mytang.brook + xyz.mytang0.brook brook-spi diff --git a/brook-spi-extensions/brook-task-extensions/brook-task-http/src/main/java/org/mytang/brook/task/http/HTTPTask.java b/brook-spi-extensions/brook-task-extensions/brook-task-http/src/main/java/xyz/mytang0/brook/task/http/HTTPTask.java similarity index 93% rename from brook-spi-extensions/brook-task-extensions/brook-task-http/src/main/java/org/mytang/brook/task/http/HTTPTask.java rename to brook-spi-extensions/brook-task-extensions/brook-task-http/src/main/java/xyz/mytang0/brook/task/http/HTTPTask.java index d7008ef..7fdae00 100644 --- a/brook-spi-extensions/brook-task-extensions/brook-task-http/src/main/java/org/mytang/brook/task/http/HTTPTask.java +++ b/brook-spi-extensions/brook-task-extensions/brook-task-http/src/main/java/xyz/mytang0/brook/task/http/HTTPTask.java @@ -1,19 +1,19 @@ -package org.mytang.brook.task.http; - -import org.mytang.brook.common.configuration.ConfigOption; -import org.mytang.brook.common.configuration.ConfigOptions; -import org.mytang.brook.common.configuration.Configuration; -import org.mytang.brook.common.constants.Delimiter; -import org.mytang.brook.common.extension.Disposable; -import org.mytang.brook.common.metadata.definition.TaskDef; -import org.mytang.brook.common.metadata.enums.TaskStatus; -import org.mytang.brook.common.metadata.instance.TaskInstance; -import org.mytang.brook.common.utils.ExceptionUtils; -import org.mytang.brook.common.utils.JsonUtils; -import org.mytang.brook.common.utils.StringUtils; -import org.mytang.brook.common.utils.token.TokenHandler; -import org.mytang.brook.common.utils.token.TokenParser; -import org.mytang.brook.spi.task.FlowTask; +package xyz.mytang0.brook.task.http; + +import xyz.mytang0.brook.common.configuration.ConfigOption; +import xyz.mytang0.brook.common.configuration.ConfigOptions; +import xyz.mytang0.brook.common.configuration.Configuration; +import xyz.mytang0.brook.common.constants.Delimiter; +import xyz.mytang0.brook.common.extension.Disposable; +import xyz.mytang0.brook.common.metadata.definition.TaskDef; +import xyz.mytang0.brook.common.metadata.enums.TaskStatus; +import xyz.mytang0.brook.common.metadata.instance.TaskInstance; +import xyz.mytang0.brook.common.utils.ExceptionUtils; +import xyz.mytang0.brook.common.utils.JsonUtils; +import xyz.mytang0.brook.common.utils.StringUtils; +import xyz.mytang0.brook.common.utils.token.TokenHandler; +import xyz.mytang0.brook.common.utils.token.TokenParser; +import xyz.mytang0.brook.spi.task.FlowTask; import org.apache.commons.collections4.MapUtils; import org.apache.http.Header; import org.apache.http.HttpEntity; @@ -58,15 +58,15 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import static org.mytang.brook.task.http.HTTPTask.Options.BODY; -import static org.mytang.brook.task.http.HTTPTask.Options.CHARSET; -import static org.mytang.brook.task.http.HTTPTask.Options.HEADERS; -import static org.mytang.brook.task.http.HTTPTask.Options.METHOD; -import static org.mytang.brook.task.http.HTTPTask.Options.PARAMS; -import static org.mytang.brook.task.http.HTTPTask.Options.REASON_PHRASE; -import static org.mytang.brook.task.http.HTTPTask.Options.STATUS_CODE; -import static org.mytang.brook.task.http.HTTPTask.Options.URI; -import static org.mytang.brook.task.http.HTTPTask.Options.VARIABLES; +import static xyz.mytang0.brook.task.http.HTTPTask.Options.BODY; +import static xyz.mytang0.brook.task.http.HTTPTask.Options.CHARSET; +import static xyz.mytang0.brook.task.http.HTTPTask.Options.HEADERS; +import static xyz.mytang0.brook.task.http.HTTPTask.Options.METHOD; +import static xyz.mytang0.brook.task.http.HTTPTask.Options.PARAMS; +import static xyz.mytang0.brook.task.http.HTTPTask.Options.REASON_PHRASE; +import static xyz.mytang0.brook.task.http.HTTPTask.Options.STATUS_CODE; +import static xyz.mytang0.brook.task.http.HTTPTask.Options.URI; +import static xyz.mytang0.brook.task.http.HTTPTask.Options.VARIABLES; import static org.apache.http.entity.ContentType.APPLICATION_FORM_URLENCODED; import static org.apache.http.entity.ContentType.APPLICATION_JSON; diff --git a/brook-spi-extensions/brook-task-extensions/brook-task-http/src/main/java/org/mytang/brook/task/http/HTTPTaskConfig.java b/brook-spi-extensions/brook-task-extensions/brook-task-http/src/main/java/xyz/mytang0/brook/task/http/HTTPTaskConfig.java similarity index 94% rename from brook-spi-extensions/brook-task-extensions/brook-task-http/src/main/java/org/mytang/brook/task/http/HTTPTaskConfig.java rename to brook-spi-extensions/brook-task-extensions/brook-task-http/src/main/java/xyz/mytang0/brook/task/http/HTTPTaskConfig.java index 2979dae..8246fd7 100644 --- a/brook-spi-extensions/brook-task-extensions/brook-task-http/src/main/java/org/mytang/brook/task/http/HTTPTaskConfig.java +++ b/brook-spi-extensions/brook-task-extensions/brook-task-http/src/main/java/xyz/mytang0/brook/task/http/HTTPTaskConfig.java @@ -1,4 +1,4 @@ -package org.mytang.brook.task.http; +package xyz.mytang0.brook.task.http; import lombok.Data; diff --git a/brook-spi-extensions/brook-task-extensions/brook-task-http/src/main/resources/META-INF/brook/org.mytang.brook.spi.task.FlowTask b/brook-spi-extensions/brook-task-extensions/brook-task-http/src/main/resources/META-INF/brook/org.mytang.brook.spi.task.FlowTask deleted file mode 100644 index 6764002..0000000 --- a/brook-spi-extensions/brook-task-extensions/brook-task-http/src/main/resources/META-INF/brook/org.mytang.brook.spi.task.FlowTask +++ /dev/null @@ -1 +0,0 @@ -HTTP=org.mytang.brook.task.http.HTTPTask \ No newline at end of file diff --git a/brook-spi-extensions/brook-task-extensions/brook-task-http/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.task.FlowTask b/brook-spi-extensions/brook-task-extensions/brook-task-http/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.task.FlowTask new file mode 100644 index 0000000..b7be835 --- /dev/null +++ b/brook-spi-extensions/brook-task-extensions/brook-task-http/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.task.FlowTask @@ -0,0 +1 @@ +HTTP=xyz.mytang0.brook.task.http.HTTPTask \ No newline at end of file diff --git a/brook-spi-extensions/brook-task-extensions/pom.xml b/brook-spi-extensions/brook-task-extensions/pom.xml index e391600..4072d9e 100644 --- a/brook-spi-extensions/brook-task-extensions/pom.xml +++ b/brook-spi-extensions/brook-task-extensions/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.mytang.brook + xyz.mytang0.brook brook-spi-extensions ${revision} ../pom.xml diff --git a/brook-spi-extensions/pom.xml b/brook-spi-extensions/pom.xml index 6e33242..2f4e2ac 100644 --- a/brook-spi-extensions/pom.xml +++ b/brook-spi-extensions/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.mytang.brook + xyz.mytang0.brook brook-parent ${revision} ../pom.xml @@ -29,7 +29,7 @@ - org.mytang.brook + xyz.mytang0.brook brook-spi ${brook-spi.version} provided diff --git a/brook-spi/pom.xml b/brook-spi/pom.xml index a6bef07..1d41e2d 100644 --- a/brook-spi/pom.xml +++ b/brook-spi/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.mytang.brook + xyz.mytang0.brook brook-parent ${revision} ../pom.xml @@ -16,7 +16,7 @@ - org.mytang.brook + xyz.mytang0.brook brook-common ${project.version} diff --git a/brook-spi/src/main/java/org/mytang/brook/spi/annotation/FlowSPI.java b/brook-spi/src/main/java/xyz/mytang0/brook/spi/annotation/FlowSPI.java similarity index 89% rename from brook-spi/src/main/java/org/mytang/brook/spi/annotation/FlowSPI.java rename to brook-spi/src/main/java/xyz/mytang0/brook/spi/annotation/FlowSPI.java index 1b1a034..b964181 100644 --- a/brook-spi/src/main/java/org/mytang/brook/spi/annotation/FlowSPI.java +++ b/brook-spi/src/main/java/xyz/mytang0/brook/spi/annotation/FlowSPI.java @@ -1,4 +1,4 @@ -package org.mytang.brook.spi.annotation; +package xyz.mytang0.brook.spi.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Inherited; diff --git a/brook-spi/src/main/java/org/mytang/brook/spi/annotation/FlowSelectedSPI.java b/brook-spi/src/main/java/xyz/mytang0/brook/spi/annotation/FlowSelectedSPI.java similarity index 80% rename from brook-spi/src/main/java/org/mytang/brook/spi/annotation/FlowSelectedSPI.java rename to brook-spi/src/main/java/xyz/mytang0/brook/spi/annotation/FlowSelectedSPI.java index 2eec35e..c766b65 100644 --- a/brook-spi/src/main/java/org/mytang/brook/spi/annotation/FlowSelectedSPI.java +++ b/brook-spi/src/main/java/xyz/mytang0/brook/spi/annotation/FlowSelectedSPI.java @@ -1,6 +1,6 @@ -package org.mytang.brook.spi.annotation; +package xyz.mytang0.brook.spi.annotation; -import org.mytang.brook.common.extension.Selected; +import xyz.mytang0.brook.common.extension.Selected; import java.lang.annotation.Documented; import java.lang.annotation.Inherited; diff --git a/brook-spi/src/main/java/org/mytang/brook/spi/cache/FlowCache.java b/brook-spi/src/main/java/xyz/mytang0/brook/spi/cache/FlowCache.java similarity index 60% rename from brook-spi/src/main/java/org/mytang/brook/spi/cache/FlowCache.java rename to brook-spi/src/main/java/xyz/mytang0/brook/spi/cache/FlowCache.java index c040fdf..536555e 100644 --- a/brook-spi/src/main/java/org/mytang/brook/spi/cache/FlowCache.java +++ b/brook-spi/src/main/java/xyz/mytang0/brook/spi/cache/FlowCache.java @@ -1,6 +1,6 @@ -package org.mytang.brook.spi.cache; +package xyz.mytang0.brook.spi.cache; -import org.mytang.brook.common.extension.SPI; +import xyz.mytang0.brook.common.extension.SPI; @SPI(value = "default") public interface FlowCache { diff --git a/brook-spi/src/main/java/org/mytang/brook/spi/cache/FlowCacheFactory.java b/brook-spi/src/main/java/xyz/mytang0/brook/spi/cache/FlowCacheFactory.java similarity index 73% rename from brook-spi/src/main/java/org/mytang/brook/spi/cache/FlowCacheFactory.java rename to brook-spi/src/main/java/xyz/mytang0/brook/spi/cache/FlowCacheFactory.java index 9ee9ba6..cb04ba7 100644 --- a/brook-spi/src/main/java/org/mytang/brook/spi/cache/FlowCacheFactory.java +++ b/brook-spi/src/main/java/xyz/mytang0/brook/spi/cache/FlowCacheFactory.java @@ -1,6 +1,6 @@ -package org.mytang.brook.spi.cache; +package xyz.mytang0.brook.spi.cache; -import org.mytang.brook.common.extension.SPI; +import xyz.mytang0.brook.common.extension.SPI; @SPI(value = "default") public interface FlowCacheFactory { diff --git a/brook-spi/src/main/java/org/mytang/brook/spi/callback/ClassTaskCallback.java b/brook-spi/src/main/java/xyz/mytang0/brook/spi/callback/ClassTaskCallback.java similarity index 57% rename from brook-spi/src/main/java/org/mytang/brook/spi/callback/ClassTaskCallback.java rename to brook-spi/src/main/java/xyz/mytang0/brook/spi/callback/ClassTaskCallback.java index 48d17ca..7dddd91 100644 --- a/brook-spi/src/main/java/org/mytang/brook/spi/callback/ClassTaskCallback.java +++ b/brook-spi/src/main/java/xyz/mytang0/brook/spi/callback/ClassTaskCallback.java @@ -1,6 +1,6 @@ -package org.mytang.brook.spi.callback; +package xyz.mytang0.brook.spi.callback; -import org.mytang.brook.common.metadata.instance.TaskInstance; +import xyz.mytang0.brook.common.metadata.instance.TaskInstance; public interface ClassTaskCallback { diff --git a/brook-spi/src/main/java/org/mytang/brook/spi/callback/TaskCallback.java b/brook-spi/src/main/java/xyz/mytang0/brook/spi/callback/TaskCallback.java similarity index 54% rename from brook-spi/src/main/java/org/mytang/brook/spi/callback/TaskCallback.java rename to brook-spi/src/main/java/xyz/mytang0/brook/spi/callback/TaskCallback.java index 4d91ab7..8e4276a 100644 --- a/brook-spi/src/main/java/org/mytang/brook/spi/callback/TaskCallback.java +++ b/brook-spi/src/main/java/xyz/mytang0/brook/spi/callback/TaskCallback.java @@ -1,7 +1,7 @@ -package org.mytang.brook.spi.callback; +package xyz.mytang0.brook.spi.callback; -import org.mytang.brook.common.extension.SPI; -import org.mytang.brook.common.metadata.instance.TaskInstance; +import xyz.mytang0.brook.common.extension.SPI; +import xyz.mytang0.brook.common.metadata.instance.TaskInstance; @SPI("default") public interface TaskCallback { diff --git a/brook-spi/src/main/java/org/mytang/brook/spi/computing/Engine.java b/brook-spi/src/main/java/xyz/mytang0/brook/spi/computing/Engine.java similarity index 78% rename from brook-spi/src/main/java/org/mytang/brook/spi/computing/Engine.java rename to brook-spi/src/main/java/xyz/mytang0/brook/spi/computing/Engine.java index dd61c1d..363c1b1 100644 --- a/brook-spi/src/main/java/org/mytang/brook/spi/computing/Engine.java +++ b/brook-spi/src/main/java/xyz/mytang0/brook/spi/computing/Engine.java @@ -1,7 +1,7 @@ -package org.mytang.brook.spi.computing; +package xyz.mytang0.brook.spi.computing; -import org.mytang.brook.common.extension.SPI; -import org.mytang.brook.spi.oss.OSSStorage; +import xyz.mytang0.brook.common.extension.SPI; +import xyz.mytang0.brook.spi.oss.OSSStorage; import javax.validation.constraints.NotBlank; diff --git a/brook-spi/src/main/java/org/mytang/brook/spi/computing/EngineActuator.java b/brook-spi/src/main/java/xyz/mytang0/brook/spi/computing/EngineActuator.java similarity index 75% rename from brook-spi/src/main/java/org/mytang/brook/spi/computing/EngineActuator.java rename to brook-spi/src/main/java/xyz/mytang0/brook/spi/computing/EngineActuator.java index dee2429..5a3da18 100644 --- a/brook-spi/src/main/java/org/mytang/brook/spi/computing/EngineActuator.java +++ b/brook-spi/src/main/java/xyz/mytang0/brook/spi/computing/EngineActuator.java @@ -1,7 +1,7 @@ -package org.mytang.brook.spi.computing; +package xyz.mytang0.brook.spi.computing; -import org.mytang.brook.common.extension.SPI; -import org.mytang.brook.spi.oss.OSSStorage; +import xyz.mytang0.brook.common.extension.SPI; +import xyz.mytang0.brook.spi.oss.OSSStorage; import java.util.Map; diff --git a/brook-spi/src/main/java/org/mytang/brook/spi/execution/ExecutionDAO.java b/brook-spi/src/main/java/xyz/mytang0/brook/spi/execution/ExecutionDAO.java similarity index 82% rename from brook-spi/src/main/java/org/mytang/brook/spi/execution/ExecutionDAO.java rename to brook-spi/src/main/java/xyz/mytang0/brook/spi/execution/ExecutionDAO.java index e3007d2..70d0a83 100644 --- a/brook-spi/src/main/java/org/mytang/brook/spi/execution/ExecutionDAO.java +++ b/brook-spi/src/main/java/xyz/mytang0/brook/spi/execution/ExecutionDAO.java @@ -1,9 +1,9 @@ -package org.mytang.brook.spi.execution; +package xyz.mytang0.brook.spi.execution; -import org.mytang.brook.common.extension.SPI; -import org.mytang.brook.common.metadata.instance.FlowInstance; -import org.mytang.brook.common.metadata.instance.TaskInstance; +import xyz.mytang0.brook.common.extension.SPI; +import xyz.mytang0.brook.common.metadata.instance.FlowInstance; +import xyz.mytang0.brook.common.metadata.instance.TaskInstance; import org.apache.commons.collections4.CollectionUtils; import java.util.List; diff --git a/brook-spi/src/main/java/org/mytang/brook/spi/executor/ExecutorFactory.java b/brook-spi/src/main/java/xyz/mytang0/brook/spi/executor/ExecutorFactory.java similarity index 71% rename from brook-spi/src/main/java/org/mytang/brook/spi/executor/ExecutorFactory.java rename to brook-spi/src/main/java/xyz/mytang0/brook/spi/executor/ExecutorFactory.java index b8ead1a..b4bba4a 100644 --- a/brook-spi/src/main/java/org/mytang/brook/spi/executor/ExecutorFactory.java +++ b/brook-spi/src/main/java/xyz/mytang0/brook/spi/executor/ExecutorFactory.java @@ -1,7 +1,7 @@ -package org.mytang.brook.spi.executor; +package xyz.mytang0.brook.spi.executor; -import org.mytang.brook.common.extension.Disposable; -import org.mytang.brook.common.extension.SPI; +import xyz.mytang0.brook.common.extension.Disposable; +import xyz.mytang0.brook.common.extension.SPI; import java.util.concurrent.ExecutorService; diff --git a/brook-spi/src/main/java/org/mytang/brook/spi/listener/FlowListener.java b/brook-spi/src/main/java/xyz/mytang0/brook/spi/listener/FlowListener.java similarity index 71% rename from brook-spi/src/main/java/org/mytang/brook/spi/listener/FlowListener.java rename to brook-spi/src/main/java/xyz/mytang0/brook/spi/listener/FlowListener.java index 5f38182..a92440d 100644 --- a/brook-spi/src/main/java/org/mytang/brook/spi/listener/FlowListener.java +++ b/brook-spi/src/main/java/xyz/mytang0/brook/spi/listener/FlowListener.java @@ -1,8 +1,8 @@ -package org.mytang.brook.spi.listener; +package xyz.mytang0.brook.spi.listener; -import org.mytang.brook.common.extension.SPI; -import org.mytang.brook.common.metadata.instance.FlowInstance; +import xyz.mytang0.brook.common.extension.SPI; +import xyz.mytang0.brook.common.metadata.instance.FlowInstance; @SPI public interface FlowListener { diff --git a/brook-spi/src/main/java/org/mytang/brook/spi/listener/TaskListener.java b/brook-spi/src/main/java/xyz/mytang0/brook/spi/listener/TaskListener.java similarity index 67% rename from brook-spi/src/main/java/org/mytang/brook/spi/listener/TaskListener.java rename to brook-spi/src/main/java/xyz/mytang0/brook/spi/listener/TaskListener.java index 0cd0a75..6969b12 100644 --- a/brook-spi/src/main/java/org/mytang/brook/spi/listener/TaskListener.java +++ b/brook-spi/src/main/java/xyz/mytang0/brook/spi/listener/TaskListener.java @@ -1,8 +1,8 @@ -package org.mytang.brook.spi.listener; +package xyz.mytang0.brook.spi.listener; -import org.mytang.brook.common.extension.SPI; -import org.mytang.brook.common.metadata.instance.TaskInstance; +import xyz.mytang0.brook.common.extension.SPI; +import xyz.mytang0.brook.common.metadata.instance.TaskInstance; @SPI public interface TaskListener { diff --git a/brook-spi/src/main/java/org/mytang/brook/spi/lock/LockService.java b/brook-spi/src/main/java/xyz/mytang0/brook/spi/lock/LockService.java similarity index 94% rename from brook-spi/src/main/java/org/mytang/brook/spi/lock/LockService.java rename to brook-spi/src/main/java/xyz/mytang0/brook/spi/lock/LockService.java index c851aef..f64c542 100644 --- a/brook-spi/src/main/java/org/mytang/brook/spi/lock/LockService.java +++ b/brook-spi/src/main/java/xyz/mytang0/brook/spi/lock/LockService.java @@ -1,6 +1,6 @@ -package org.mytang.brook.spi.lock; +package xyz.mytang0.brook.spi.lock; -import org.mytang.brook.common.extension.SPI; +import xyz.mytang0.brook.common.extension.SPI; import java.util.concurrent.TimeUnit; diff --git a/brook-spi/src/main/java/org/mytang/brook/spi/metadata/MetadataService.java b/brook-spi/src/main/java/xyz/mytang0/brook/spi/metadata/MetadataService.java similarity index 58% rename from brook-spi/src/main/java/org/mytang/brook/spi/metadata/MetadataService.java rename to brook-spi/src/main/java/xyz/mytang0/brook/spi/metadata/MetadataService.java index b2dd773..ac13849 100644 --- a/brook-spi/src/main/java/org/mytang/brook/spi/metadata/MetadataService.java +++ b/brook-spi/src/main/java/xyz/mytang0/brook/spi/metadata/MetadataService.java @@ -1,7 +1,7 @@ -package org.mytang.brook.spi.metadata; +package xyz.mytang0.brook.spi.metadata; -import org.mytang.brook.common.extension.SPI; -import org.mytang.brook.common.metadata.definition.FlowDef; +import xyz.mytang0.brook.common.extension.SPI; +import xyz.mytang0.brook.common.metadata.definition.FlowDef; @SPI(value = "file") public interface MetadataService { diff --git a/brook-spi/src/main/java/org/mytang/brook/spi/oss/OSSService.java b/brook-spi/src/main/java/xyz/mytang0/brook/spi/oss/OSSService.java similarity index 58% rename from brook-spi/src/main/java/org/mytang/brook/spi/oss/OSSService.java rename to brook-spi/src/main/java/xyz/mytang0/brook/spi/oss/OSSService.java index 3fb05fa..097754f 100644 --- a/brook-spi/src/main/java/org/mytang/brook/spi/oss/OSSService.java +++ b/brook-spi/src/main/java/xyz/mytang0/brook/spi/oss/OSSService.java @@ -1,6 +1,6 @@ -package org.mytang.brook.spi.oss; +package xyz.mytang0.brook.spi.oss; -import org.mytang.brook.common.extension.SPI; +import xyz.mytang0.brook.common.extension.SPI; import java.io.InputStream; diff --git a/brook-spi/src/main/java/org/mytang/brook/spi/oss/OSSStorage.java b/brook-spi/src/main/java/xyz/mytang0/brook/spi/oss/OSSStorage.java similarity index 82% rename from brook-spi/src/main/java/org/mytang/brook/spi/oss/OSSStorage.java rename to brook-spi/src/main/java/xyz/mytang0/brook/spi/oss/OSSStorage.java index ec14d0c..7947ee1 100644 --- a/brook-spi/src/main/java/org/mytang/brook/spi/oss/OSSStorage.java +++ b/brook-spi/src/main/java/xyz/mytang0/brook/spi/oss/OSSStorage.java @@ -1,7 +1,7 @@ -package org.mytang.brook.spi.oss; +package xyz.mytang0.brook.spi.oss; -import org.mytang.brook.common.configuration.Validatable; -import org.mytang.brook.common.utils.StringUtils; +import xyz.mytang0.brook.common.configuration.Validatable; +import xyz.mytang0.brook.common.utils.StringUtils; import lombok.Data; import java.io.Serializable; diff --git a/brook-spi/src/main/java/org/mytang/brook/spi/queue/QueueService.java b/brook-spi/src/main/java/xyz/mytang0/brook/spi/queue/QueueService.java similarity index 83% rename from brook-spi/src/main/java/org/mytang/brook/spi/queue/QueueService.java rename to brook-spi/src/main/java/xyz/mytang0/brook/spi/queue/QueueService.java index 8964ec4..e2dcba3 100644 --- a/brook-spi/src/main/java/org/mytang/brook/spi/queue/QueueService.java +++ b/brook-spi/src/main/java/xyz/mytang0/brook/spi/queue/QueueService.java @@ -1,13 +1,13 @@ -package org.mytang.brook.spi.queue; +package xyz.mytang0.brook.spi.queue; -import org.mytang.brook.common.extension.SPI; -import org.mytang.brook.common.metadata.model.QueueMessage; +import xyz.mytang0.brook.common.extension.SPI; +import xyz.mytang0.brook.common.metadata.model.QueueMessage; import org.apache.commons.collections4.CollectionUtils; import java.util.List; import java.util.concurrent.TimeUnit; -import static org.mytang.brook.common.constants.QueueConstants.DEFAULT_POSTPONE; +import static xyz.mytang0.brook.common.constants.QueueConstants.DEFAULT_POSTPONE; @SPI(value = "local") public interface QueueService { diff --git a/brook-spi/src/main/java/org/mytang/brook/spi/task/FlowTask.java b/brook-spi/src/main/java/xyz/mytang0/brook/spi/task/FlowTask.java similarity index 80% rename from brook-spi/src/main/java/org/mytang/brook/spi/task/FlowTask.java rename to brook-spi/src/main/java/xyz/mytang0/brook/spi/task/FlowTask.java index be75cbf..221e238 100644 --- a/brook-spi/src/main/java/org/mytang/brook/spi/task/FlowTask.java +++ b/brook-spi/src/main/java/xyz/mytang0/brook/spi/task/FlowTask.java @@ -1,12 +1,12 @@ -package org.mytang.brook.spi.task; - -import org.mytang.brook.common.extension.SPI; -import org.mytang.brook.common.utils.JsonUtils; -import org.mytang.brook.common.utils.TimeUtils; -import org.mytang.brook.common.context.TaskMapperContext; -import org.mytang.brook.common.metadata.definition.TaskDef; -import org.mytang.brook.common.metadata.enums.TaskStatus; -import org.mytang.brook.common.metadata.instance.TaskInstance; +package xyz.mytang0.brook.spi.task; + +import xyz.mytang0.brook.common.extension.SPI; +import xyz.mytang0.brook.common.utils.JsonUtils; +import xyz.mytang0.brook.common.utils.TimeUtils; +import xyz.mytang0.brook.common.context.TaskMapperContext; +import xyz.mytang0.brook.common.metadata.definition.TaskDef; +import xyz.mytang0.brook.common.metadata.enums.TaskStatus; +import xyz.mytang0.brook.common.metadata.instance.TaskInstance; import com.fasterxml.jackson.core.type.TypeReference; import javax.validation.constraints.NotBlank; diff --git a/brook-spi/src/main/java/org/mytang/brook/spi/task/Options.java b/brook-spi/src/main/java/xyz/mytang0/brook/spi/task/Options.java similarity index 94% rename from brook-spi/src/main/java/org/mytang/brook/spi/task/Options.java rename to brook-spi/src/main/java/xyz/mytang0/brook/spi/task/Options.java index 94073dc..51b353d 100644 --- a/brook-spi/src/main/java/org/mytang/brook/spi/task/Options.java +++ b/brook-spi/src/main/java/xyz/mytang0/brook/spi/task/Options.java @@ -1,8 +1,8 @@ -package org.mytang.brook.spi.task; +package xyz.mytang0.brook.spi.task; -import org.mytang.brook.common.constants.Delimiter; -import org.mytang.brook.common.configuration.ConfigOption; -import org.mytang.brook.common.configuration.Configuration; +import xyz.mytang0.brook.common.constants.Delimiter; +import xyz.mytang0.brook.common.configuration.ConfigOption; +import xyz.mytang0.brook.common.configuration.Configuration; import javax.validation.ValidationException; import javax.validation.constraints.NotNull; diff --git a/brook-spring-boot/brook-spring-boot-autoconfigure/pom.xml b/brook-spring-boot/brook-spring-boot-autoconfigure/pom.xml index 406cbd0..fa251d8 100644 --- a/brook-spring-boot/brook-spring-boot-autoconfigure/pom.xml +++ b/brook-spring-boot/brook-spring-boot-autoconfigure/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.mytang.brook + xyz.mytang0.brook brook-spring-boot ${revision} ../pom.xml @@ -43,7 +43,7 @@ - org.mytang.brook + xyz.mytang0.brook brook-engine ${project.version} diff --git a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/org/mytang/brook/spring/boot/annotation/Taskable.java b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/annotation/Taskable.java similarity index 91% rename from brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/org/mytang/brook/spring/boot/annotation/Taskable.java rename to brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/annotation/Taskable.java index 5b6bccc..c69e3da 100644 --- a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/org/mytang/brook/spring/boot/annotation/Taskable.java +++ b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/annotation/Taskable.java @@ -1,4 +1,4 @@ -package org.mytang.brook.spring.boot.annotation; +package xyz.mytang0.brook.spring.boot.annotation; import javax.validation.constraints.NotBlank; import java.lang.annotation.Documented; diff --git a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/org/mytang/brook/spring/boot/autoconfigure/FlowAutoConfiguration.java b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/autoconfigure/FlowAutoConfiguration.java similarity index 81% rename from brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/org/mytang/brook/spring/boot/autoconfigure/FlowAutoConfiguration.java rename to brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/autoconfigure/FlowAutoConfiguration.java index 0696d51..179ae4c 100644 --- a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/org/mytang/brook/spring/boot/autoconfigure/FlowAutoConfiguration.java +++ b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/autoconfigure/FlowAutoConfiguration.java @@ -1,15 +1,15 @@ -package org.mytang.brook.spring.boot.autoconfigure; +package xyz.mytang0.brook.spring.boot.autoconfigure; -import org.mytang.brook.core.FlowExecutor; -import org.mytang.brook.core.FlowTaskRegistry; -import org.mytang.brook.core.execution.ExecutionProperties; -import org.mytang.brook.core.lock.FlowLockFacade; -import org.mytang.brook.core.lock.LockProperties; -import org.mytang.brook.core.metadata.MetadataProperties; -import org.mytang.brook.core.monitor.DelayedTaskMonitorProperties; -import org.mytang.brook.core.queue.QueueProperties; -import org.mytang.brook.core.service.FlowLogService; -import org.mytang.brook.spi.task.FlowTask; +import xyz.mytang0.brook.core.FlowExecutor; +import xyz.mytang0.brook.core.FlowTaskRegistry; +import xyz.mytang0.brook.core.execution.ExecutionProperties; +import xyz.mytang0.brook.core.lock.FlowLockFacade; +import xyz.mytang0.brook.core.lock.LockProperties; +import xyz.mytang0.brook.core.metadata.MetadataProperties; +import xyz.mytang0.brook.core.monitor.DelayedTaskMonitorProperties; +import xyz.mytang0.brook.core.queue.QueueProperties; +import xyz.mytang0.brook.core.service.FlowLogService; +import xyz.mytang0.brook.spi.task.FlowTask; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -17,7 +17,7 @@ import org.springframework.context.annotation.Configuration; @Configuration -@ComponentScan("org.mytang.brook.spring.boot") +@ComponentScan("xyz.mytang0.brook.spring.boot") @ConditionalOnProperty(name = "brook.enabled", havingValue = "true", matchIfMissing = true) public class FlowAutoConfiguration { diff --git a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/org/mytang/brook/spring/boot/autoconfigure/FlowBeanDefinitionRegistryPostProcessor.java b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/autoconfigure/FlowBeanDefinitionRegistryPostProcessor.java similarity index 90% rename from brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/org/mytang/brook/spring/boot/autoconfigure/FlowBeanDefinitionRegistryPostProcessor.java rename to brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/autoconfigure/FlowBeanDefinitionRegistryPostProcessor.java index f7fc53c..587b225 100644 --- a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/org/mytang/brook/spring/boot/autoconfigure/FlowBeanDefinitionRegistryPostProcessor.java +++ b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/autoconfigure/FlowBeanDefinitionRegistryPostProcessor.java @@ -1,6 +1,6 @@ -package org.mytang.brook.spring.boot.autoconfigure; +package xyz.mytang0.brook.spring.boot.autoconfigure; -import org.mytang.brook.spring.boot.extension.SpringExtensionInjector; +import xyz.mytang0.brook.spring.boot.extension.SpringExtensionInjector; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.support.BeanDefinitionRegistry; diff --git a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/org/mytang/brook/spring/boot/autoconfigure/FlowSPIBeanRegister.java b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/autoconfigure/FlowSPIBeanRegister.java similarity index 85% rename from brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/org/mytang/brook/spring/boot/autoconfigure/FlowSPIBeanRegister.java rename to brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/autoconfigure/FlowSPIBeanRegister.java index a91a342..48fe1e6 100644 --- a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/org/mytang/brook/spring/boot/autoconfigure/FlowSPIBeanRegister.java +++ b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/autoconfigure/FlowSPIBeanRegister.java @@ -1,10 +1,10 @@ -package org.mytang.brook.spring.boot.autoconfigure; +package xyz.mytang0.brook.spring.boot.autoconfigure; -import org.mytang.brook.common.extension.ExtensionDirector; -import org.mytang.brook.common.extension.ExtensionLoader; -import org.mytang.brook.common.extension.SPI; -import org.mytang.brook.spi.annotation.FlowSPI; -import org.mytang.brook.spi.annotation.FlowSelectedSPI; +import xyz.mytang0.brook.common.extension.ExtensionDirector; +import xyz.mytang0.brook.common.extension.ExtensionLoader; +import xyz.mytang0.brook.common.extension.SPI; +import xyz.mytang0.brook.spi.annotation.FlowSPI; +import xyz.mytang0.brook.spi.annotation.FlowSelectedSPI; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ClassUtils; diff --git a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/org/mytang/brook/spring/boot/computing/SpelEngine.java b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/computing/SpelEngine.java similarity index 95% rename from brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/org/mytang/brook/spring/boot/computing/SpelEngine.java rename to brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/computing/SpelEngine.java index ec83581..f4e291a 100644 --- a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/org/mytang/brook/spring/boot/computing/SpelEngine.java +++ b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/computing/SpelEngine.java @@ -1,6 +1,6 @@ -package org.mytang.brook.spring.boot.computing; +package xyz.mytang0.brook.spring.boot.computing; -import org.mytang.brook.spi.computing.Engine; +import xyz.mytang0.brook.spi.computing.Engine; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; import lombok.extern.slf4j.Slf4j; diff --git a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/org/mytang/brook/spring/boot/extension/SpringExtensionInjector.java b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/extension/SpringExtensionInjector.java similarity index 85% rename from brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/org/mytang/brook/spring/boot/extension/SpringExtensionInjector.java rename to brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/extension/SpringExtensionInjector.java index 29552ec..76d9203 100644 --- a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/org/mytang/brook/spring/boot/extension/SpringExtensionInjector.java +++ b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/extension/SpringExtensionInjector.java @@ -1,9 +1,9 @@ -package org.mytang.brook.spring.boot.extension; +package xyz.mytang0.brook.spring.boot.extension; -import org.mytang.brook.common.annotation.Order; -import org.mytang.brook.common.extension.ExtensionDirector; -import org.mytang.brook.common.extension.injector.ExtensionInjector; -import org.mytang.brook.common.utils.StringUtils; +import xyz.mytang0.brook.common.annotation.Order; +import xyz.mytang0.brook.common.extension.ExtensionDirector; +import xyz.mytang0.brook.common.extension.injector.ExtensionInjector; +import xyz.mytang0.brook.common.utils.StringUtils; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.context.ApplicationContext; diff --git a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/org/mytang/brook/spring/boot/tasks/SpringBeanMethodTask.java b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/tasks/SpringBeanMethodTask.java similarity index 87% rename from brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/org/mytang/brook/spring/boot/tasks/SpringBeanMethodTask.java rename to brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/tasks/SpringBeanMethodTask.java index 015b6aa..2e81be8 100644 --- a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/org/mytang/brook/spring/boot/tasks/SpringBeanMethodTask.java +++ b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/tasks/SpringBeanMethodTask.java @@ -1,16 +1,16 @@ -package org.mytang.brook.spring.boot.tasks; - - -import org.mytang.brook.common.configuration.ConfigOption; -import org.mytang.brook.common.configuration.ConfigOptions; -import org.mytang.brook.common.configuration.Configuration; -import org.mytang.brook.common.metadata.enums.TaskStatus; -import org.mytang.brook.common.metadata.instance.TaskInstance; -import org.mytang.brook.common.utils.JsonUtils; -import org.mytang.brook.common.utils.MethodUtils; -import org.mytang.brook.core.exception.TerminateException; -import org.mytang.brook.spi.task.FlowTask; -import org.mytang.brook.spring.boot.utils.SpringContextUtils; +package xyz.mytang0.brook.spring.boot.tasks; + + +import xyz.mytang0.brook.common.configuration.ConfigOption; +import xyz.mytang0.brook.common.configuration.ConfigOptions; +import xyz.mytang0.brook.common.configuration.Configuration; +import xyz.mytang0.brook.common.metadata.enums.TaskStatus; +import xyz.mytang0.brook.common.metadata.instance.TaskInstance; +import xyz.mytang0.brook.common.utils.JsonUtils; +import xyz.mytang0.brook.common.utils.MethodUtils; +import xyz.mytang0.brook.core.exception.TerminateException; +import xyz.mytang0.brook.spi.task.FlowTask; +import xyz.mytang0.brook.spring.boot.utils.SpringContextUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.NoSuchBeanDefinitionException; diff --git a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/org/mytang/brook/spring/boot/tasks/TaskableAnnotationTask.java b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/tasks/TaskableAnnotationTask.java similarity index 87% rename from brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/org/mytang/brook/spring/boot/tasks/TaskableAnnotationTask.java rename to brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/tasks/TaskableAnnotationTask.java index 741d8e5..b1cedf7 100644 --- a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/org/mytang/brook/spring/boot/tasks/TaskableAnnotationTask.java +++ b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/tasks/TaskableAnnotationTask.java @@ -1,19 +1,19 @@ -package org.mytang.brook.spring.boot.tasks; - -import org.mytang.brook.common.configuration.ConfigOption; -import org.mytang.brook.common.configuration.ConfigOptions; -import org.mytang.brook.common.metadata.enums.FlowStatus; -import org.mytang.brook.common.metadata.enums.TaskStatus; -import org.mytang.brook.common.metadata.instance.TaskInstance; -import org.mytang.brook.common.utils.ExceptionUtils; -import org.mytang.brook.common.utils.JsonUtils; -import org.mytang.brook.common.utils.MethodUtils; -import org.mytang.brook.core.FlowTaskRegistry; -import org.mytang.brook.core.exception.FlowException; -import org.mytang.brook.core.exception.TerminateException; -import org.mytang.brook.core.utils.ThreadUtils; -import org.mytang.brook.spi.task.FlowTask; -import org.mytang.brook.spring.boot.annotation.Taskable; +package xyz.mytang0.brook.spring.boot.tasks; + +import xyz.mytang0.brook.common.configuration.ConfigOption; +import xyz.mytang0.brook.common.configuration.ConfigOptions; +import xyz.mytang0.brook.common.metadata.enums.FlowStatus; +import xyz.mytang0.brook.common.metadata.enums.TaskStatus; +import xyz.mytang0.brook.common.metadata.instance.TaskInstance; +import xyz.mytang0.brook.common.utils.ExceptionUtils; +import xyz.mytang0.brook.common.utils.JsonUtils; +import xyz.mytang0.brook.common.utils.MethodUtils; +import xyz.mytang0.brook.core.FlowTaskRegistry; +import xyz.mytang0.brook.core.exception.FlowException; +import xyz.mytang0.brook.core.exception.TerminateException; +import xyz.mytang0.brook.core.utils.ThreadUtils; +import xyz.mytang0.brook.spi.task.FlowTask; +import xyz.mytang0.brook.spring.boot.annotation.Taskable; import com.fasterxml.jackson.core.type.TypeReference; import lombok.extern.slf4j.Slf4j; import org.springframework.aop.support.AopUtils; @@ -28,7 +28,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import static org.mytang.brook.core.exception.FlowErrorCode.FLOW_EXECUTION_ERROR; +import static xyz.mytang0.brook.core.exception.FlowErrorCode.FLOW_EXECUTION_ERROR; @Slf4j @Configuration @@ -87,7 +87,7 @@ public ConfigOption catalog() { } @Override - public void verify(@NotNull org.mytang.brook.common.configuration.Configuration configuration) { + public void verify(@NotNull xyz.mytang0.brook.common.configuration.Configuration configuration) { // Because of the characteristics of Java itself, // the method name is compressed, so no verification is required. } diff --git a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/org/mytang/brook/spring/boot/utils/SpringContextUtils.java b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/utils/SpringContextUtils.java similarity index 98% rename from brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/org/mytang/brook/spring/boot/utils/SpringContextUtils.java rename to brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/utils/SpringContextUtils.java index b7518ee..4c4ab03 100644 --- a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/org/mytang/brook/spring/boot/utils/SpringContextUtils.java +++ b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/utils/SpringContextUtils.java @@ -1,4 +1,4 @@ -package org.mytang.brook.spring.boot.utils; +package xyz.mytang0.brook.spring.boot.utils; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.BeansException; diff --git a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/resources/META-INF/brook/org.mytang.brook.common.extension.injector.ExtensionInjector b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/resources/META-INF/brook/org.mytang.brook.common.extension.injector.ExtensionInjector deleted file mode 100644 index 5a3c4cd..0000000 --- a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/resources/META-INF/brook/org.mytang.brook.common.extension.injector.ExtensionInjector +++ /dev/null @@ -1 +0,0 @@ -spring=org.mytang.brook.spring.boot.extension.SpringExtensionInjector diff --git a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/resources/META-INF/brook/org.mytang.brook.spi.computing.Engine b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/resources/META-INF/brook/org.mytang.brook.spi.computing.Engine deleted file mode 100644 index 4ef44ba..0000000 --- a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/resources/META-INF/brook/org.mytang.brook.spi.computing.Engine +++ /dev/null @@ -1 +0,0 @@ -spel=org.mytang.brook.spring.boot.computing.SpelEngine \ No newline at end of file diff --git a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/resources/META-INF/brook/org.mytang.brook.spi.task.FlowTask b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/resources/META-INF/brook/org.mytang.brook.spi.task.FlowTask deleted file mode 100644 index 908be40..0000000 --- a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/resources/META-INF/brook/org.mytang.brook.spi.task.FlowTask +++ /dev/null @@ -1 +0,0 @@ -springBeanMethod=org.mytang.brook.spring.boot.tasks.SpringBeanMethodTask \ No newline at end of file diff --git a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/resources/META-INF/brook/xyz.mytang0.brook.common.extension.injector.ExtensionInjector b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/resources/META-INF/brook/xyz.mytang0.brook.common.extension.injector.ExtensionInjector new file mode 100644 index 0000000..bad04ca --- /dev/null +++ b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/resources/META-INF/brook/xyz.mytang0.brook.common.extension.injector.ExtensionInjector @@ -0,0 +1 @@ +spring=xyz.mytang0.brook.spring.boot.extension.SpringExtensionInjector diff --git a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.computing.Engine b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.computing.Engine new file mode 100644 index 0000000..8ee76bb --- /dev/null +++ b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.computing.Engine @@ -0,0 +1 @@ +spel=xyz.mytang0.brook.spring.boot.computing.SpelEngine \ No newline at end of file diff --git a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.task.FlowTask b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.task.FlowTask new file mode 100644 index 0000000..fa9580f --- /dev/null +++ b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/resources/META-INF/brook/xyz.mytang0.brook.spi.task.FlowTask @@ -0,0 +1 @@ +springBeanMethod=xyz.mytang0.brook.spring.boot.tasks.SpringBeanMethodTask \ No newline at end of file diff --git a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/resources/META-INF/spring-configuration-metadata.json b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/resources/META-INF/spring-configuration-metadata.json index 67728ba..5fde066 100644 --- a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/resources/META-INF/spring-configuration-metadata.json @@ -2,45 +2,45 @@ "hints": [], "groups": [ { - "sourceType": "org.mytang.brook.spring.boot.autoconfigure.FlowAutoConfiguration", + "sourceType": "xyz.mytang0.brook.spring.boot.autoconfigure.FlowAutoConfiguration", "name": "brook.lock", "sourceMethod": "flowLockProperties()", - "type": "org.mytang.brook.core.lock.FlowLockFacade$LockProperties" + "type": "xyz.mytang0.brook.core.lock.FlowLockFacade$LockProperties" }, { - "sourceType": "org.mytang.brook.spring.boot.autoconfigure.FlowAutoConfiguration", + "sourceType": "xyz.mytang0.brook.spring.boot.autoconfigure.FlowAutoConfiguration", "name": "brook.log", "sourceMethod": "flowLogProperties()", - "type": "org.mytang.brook.core.service.FlowLogService$FlowLogProperties" + "type": "xyz.mytang0.brook.core.service.FlowLogService$FlowLogProperties" } ], "properties": [ { - "sourceType": "org.mytang.brook.core.lock.FlowLockFacade$LockProperties", + "sourceType": "xyz.mytang0.brook.core.lock.FlowLockFacade$LockProperties", "name": "brook.lock.enabled", "description": "Whether to enable flow-lock, the default is 'false'.", "type": "java.lang.Boolean" }, { - "sourceType": "org.mytang.brook.core.lock.FlowLockFacade$LockProperties", + "sourceType": "xyz.mytang0.brook.core.lock.FlowLockFacade$LockProperties", "name": "brook.lock.lock-lease-time", "description": "The maximum lock occupancy time. When the time is reached, the lock will be automatically released. The default is 60000 millis.", "type": "java.time.Duration" }, { - "sourceType": "org.mytang.brook.core.lock.FlowLockFacade$LockProperties", + "sourceType": "xyz.mytang0.brook.core.lock.FlowLockFacade$LockProperties", "name": "brook.lock.lock-time-to-try", "description": "Maximum lock acquisition time. After the time is reached, the wait ends even if the lock is not acquired. The default value is 500 milliseconds.", "type": "java.time.Duration" }, { - "sourceType": "org.mytang.brook.core.service.FlowLogService$FlowLogProperties", + "sourceType": "xyz.mytang0.brook.core.service.FlowLogService$FlowLogProperties", "name": "brook.log.root", "description": "After the flow turns on log output, the storage path of the log. The default is '$USER_DIR/logs'.", "type": "java.lang.String" }, { - "sourceType": "org.mytang.brook.core.service.FlowLogService$FlowLogProperties", + "sourceType": "xyz.mytang0.brook.core.service.FlowLogService$FlowLogProperties", "name": "brook.log.suffix", "description": "The log file suffix, default value is '.log'.", "type": "java.lang.String" diff --git a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories index bb7b65c..47c8471 100644 --- a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.mytang.brook.spring.boot.autoconfigure.FlowAutoConfiguration + xyz.mytang0.brook.spring.boot.autoconfigure.FlowAutoConfiguration diff --git a/brook-spring-boot/brook-spring-boot-locks/brook-spring-boot-lock-redis/pom.xml b/brook-spring-boot/brook-spring-boot-locks/brook-spring-boot-lock-redis/pom.xml index 26128d4..08dede1 100644 --- a/brook-spring-boot/brook-spring-boot-locks/brook-spring-boot-lock-redis/pom.xml +++ b/brook-spring-boot/brook-spring-boot-locks/brook-spring-boot-lock-redis/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.mytang.brook + xyz.mytang0.brook brook-spring-boot-locks ${revision} ../pom.xml @@ -26,14 +26,14 @@ - org.mytang.brook + xyz.mytang0.brook brook-spi ${brook-common.version} true - org.mytang.brook + xyz.mytang0.brook brook-lock-redis ${brook-lock-redis.version} diff --git a/brook-spring-boot/brook-spring-boot-locks/brook-spring-boot-lock-redis/src/main/java/org/mytang/brook/spring/boot/lock/redis/RedisLockAutoConfiguration.java b/brook-spring-boot/brook-spring-boot-locks/brook-spring-boot-lock-redis/src/main/java/xyz/mytang0/brook/spring/boot/lock/redis/RedisLockAutoConfiguration.java similarity index 96% rename from brook-spring-boot/brook-spring-boot-locks/brook-spring-boot-lock-redis/src/main/java/org/mytang/brook/spring/boot/lock/redis/RedisLockAutoConfiguration.java rename to brook-spring-boot/brook-spring-boot-locks/brook-spring-boot-lock-redis/src/main/java/xyz/mytang0/brook/spring/boot/lock/redis/RedisLockAutoConfiguration.java index cbb3a16..25bcdfa 100644 --- a/brook-spring-boot/brook-spring-boot-locks/brook-spring-boot-lock-redis/src/main/java/org/mytang/brook/spring/boot/lock/redis/RedisLockAutoConfiguration.java +++ b/brook-spring-boot/brook-spring-boot-locks/brook-spring-boot-lock-redis/src/main/java/xyz/mytang0/brook/spring/boot/lock/redis/RedisLockAutoConfiguration.java @@ -1,6 +1,6 @@ -package org.mytang.brook.spring.boot.lock.redis; +package xyz.mytang0.brook.spring.boot.lock.redis; -import org.mytang.brook.lock.redis.RedisLockService; +import xyz.mytang0.brook.lock.redis.RedisLockService; import org.redisson.config.ClusterServersConfig; import org.redisson.config.Config; import org.redisson.config.MasterSlaveServersConfig; diff --git a/brook-spring-boot/brook-spring-boot-locks/brook-spring-boot-lock-redis/src/main/resources/META-INF/spring.factories b/brook-spring-boot/brook-spring-boot-locks/brook-spring-boot-lock-redis/src/main/resources/META-INF/spring.factories index c1d0568..537c718 100644 --- a/brook-spring-boot/brook-spring-boot-locks/brook-spring-boot-lock-redis/src/main/resources/META-INF/spring.factories +++ b/brook-spring-boot/brook-spring-boot-locks/brook-spring-boot-lock-redis/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.mytang.brook.spring.boot.lock.redis.RedisLockAutoConfiguration + xyz.mytang0.brook.spring.boot.lock.redis.RedisLockAutoConfiguration diff --git a/brook-spring-boot/brook-spring-boot-locks/pom.xml b/brook-spring-boot/brook-spring-boot-locks/pom.xml index 45612d6..ab55556 100644 --- a/brook-spring-boot/brook-spring-boot-locks/pom.xml +++ b/brook-spring-boot/brook-spring-boot-locks/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.mytang.brook + xyz.mytang0.brook brook-spring-boot ${revision} ../pom.xml diff --git a/brook-spring-boot/brook-spring-boot-metadata/brook-spring-boot-http-metadata/pom.xml b/brook-spring-boot/brook-spring-boot-metadata/brook-spring-boot-http-metadata/pom.xml index e44d8fa..c09f961 100644 --- a/brook-spring-boot/brook-spring-boot-metadata/brook-spring-boot-http-metadata/pom.xml +++ b/brook-spring-boot/brook-spring-boot-metadata/brook-spring-boot-http-metadata/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.mytang.brook + xyz.mytang0.brook brook-spring-boot-metadata ${revision} ../pom.xml @@ -20,7 +20,7 @@ - org.mytang.brook + xyz.mytang0.brook brook-metadata-http ${brook-metadata-http.version} diff --git a/brook-spring-boot/brook-spring-boot-metadata/brook-spring-boot-http-metadata/src/main/java/org/mytang/brook/spring/boot/metadata/http/HTTPMetadataAutoConfiguration.java b/brook-spring-boot/brook-spring-boot-metadata/brook-spring-boot-http-metadata/src/main/java/xyz/mytang0/brook/spring/boot/metadata/http/HTTPMetadataAutoConfiguration.java similarity index 73% rename from brook-spring-boot/brook-spring-boot-metadata/brook-spring-boot-http-metadata/src/main/java/org/mytang/brook/spring/boot/metadata/http/HTTPMetadataAutoConfiguration.java rename to brook-spring-boot/brook-spring-boot-metadata/brook-spring-boot-http-metadata/src/main/java/xyz/mytang0/brook/spring/boot/metadata/http/HTTPMetadataAutoConfiguration.java index dc61684..8cd2064 100644 --- a/brook-spring-boot/brook-spring-boot-metadata/brook-spring-boot-http-metadata/src/main/java/org/mytang/brook/spring/boot/metadata/http/HTTPMetadataAutoConfiguration.java +++ b/brook-spring-boot/brook-spring-boot-metadata/brook-spring-boot-http-metadata/src/main/java/xyz/mytang0/brook/spring/boot/metadata/http/HTTPMetadataAutoConfiguration.java @@ -1,7 +1,7 @@ -package org.mytang.brook.spring.boot.metadata.http; +package xyz.mytang0.brook.spring.boot.metadata.http; -import org.mytang.brook.metadata.http.HTTPMetadataConfig; -import org.mytang.brook.metadata.http.HTTPMetadataService; +import xyz.mytang0.brook.metadata.http.HTTPMetadataConfig; +import xyz.mytang0.brook.metadata.http.HTTPMetadataService; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; diff --git a/brook-spring-boot/brook-spring-boot-metadata/brook-spring-boot-http-metadata/src/main/resources/META-INF/spring.factories b/brook-spring-boot/brook-spring-boot-metadata/brook-spring-boot-http-metadata/src/main/resources/META-INF/spring.factories index c880087..0f8bbbf 100644 --- a/brook-spring-boot/brook-spring-boot-metadata/brook-spring-boot-http-metadata/src/main/resources/META-INF/spring.factories +++ b/brook-spring-boot/brook-spring-boot-metadata/brook-spring-boot-http-metadata/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.mytang.brook.spring.boot.metadata.http.HTTPMetadataAutoConfiguration + xyz.mytang0.brook.spring.boot.metadata.http.HTTPMetadataAutoConfiguration diff --git a/brook-spring-boot/brook-spring-boot-metadata/pom.xml b/brook-spring-boot/brook-spring-boot-metadata/pom.xml index eb16ec5..f961f7e 100644 --- a/brook-spring-boot/brook-spring-boot-metadata/pom.xml +++ b/brook-spring-boot/brook-spring-boot-metadata/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.mytang.brook + xyz.mytang0.brook brook-spring-boot ${revision} ../pom.xml diff --git a/brook-spring-boot/brook-spring-boot-mybatis/pom.xml b/brook-spring-boot/brook-spring-boot-mybatis/pom.xml index 7beeb11..3df5929 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/pom.xml +++ b/brook-spring-boot/brook-spring-boot-mybatis/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.mytang.brook + xyz.mytang0.brook brook-spring-boot ${revision} ../pom.xml @@ -21,7 +21,7 @@ - org.mytang.brook + xyz.mytang0.brook brook-spi ${project.version} diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/MysqlExecutionDAO.java b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/MysqlExecutionDAO.java similarity index 90% rename from brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/MysqlExecutionDAO.java rename to brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/MysqlExecutionDAO.java index 91101dd..0a6108f 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/MysqlExecutionDAO.java +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/MysqlExecutionDAO.java @@ -1,19 +1,19 @@ -package org.mytang.brook.spring.boot.mybatis; - -import org.mytang.brook.common.metadata.definition.TaskDef; -import org.mytang.brook.common.metadata.instance.FlowInstance; -import org.mytang.brook.common.metadata.instance.TaskInstance; -import org.mytang.brook.common.utils.JsonUtils; -import org.mytang.brook.spi.annotation.FlowSelectedSPI; -import org.mytang.brook.spi.execution.ExecutionDAO; -import org.mytang.brook.spring.boot.mybatis.entity.Flow; -import org.mytang.brook.spring.boot.mybatis.entity.FlowPending; -import org.mytang.brook.spring.boot.mybatis.entity.Task; -import org.mytang.brook.spring.boot.mybatis.entity.TaskPending; -import org.mytang.brook.spring.boot.mybatis.mapper.FlowMapper; -import org.mytang.brook.spring.boot.mybatis.mapper.FlowPendingMapper; -import org.mytang.brook.spring.boot.mybatis.mapper.TaskMapper; -import org.mytang.brook.spring.boot.mybatis.mapper.TaskPendingMapper; +package xyz.mytang0.brook.spring.boot.mybatis; + +import xyz.mytang0.brook.common.metadata.definition.TaskDef; +import xyz.mytang0.brook.common.metadata.instance.FlowInstance; +import xyz.mytang0.brook.common.metadata.instance.TaskInstance; +import xyz.mytang0.brook.common.utils.JsonUtils; +import xyz.mytang0.brook.spi.annotation.FlowSelectedSPI; +import xyz.mytang0.brook.spi.execution.ExecutionDAO; +import xyz.mytang0.brook.spring.boot.mybatis.entity.Flow; +import xyz.mytang0.brook.spring.boot.mybatis.entity.FlowPending; +import xyz.mytang0.brook.spring.boot.mybatis.entity.Task; +import xyz.mytang0.brook.spring.boot.mybatis.entity.TaskPending; +import xyz.mytang0.brook.spring.boot.mybatis.mapper.FlowMapper; +import xyz.mytang0.brook.spring.boot.mybatis.mapper.FlowPendingMapper; +import xyz.mytang0.brook.spring.boot.mybatis.mapper.TaskMapper; +import xyz.mytang0.brook.spring.boot.mybatis.mapper.TaskPendingMapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/MysqlMetadataService.java b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/MysqlMetadataService.java similarity index 86% rename from brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/MysqlMetadataService.java rename to brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/MysqlMetadataService.java index dbae19a..8a24fca 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/MysqlMetadataService.java +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/MysqlMetadataService.java @@ -1,11 +1,11 @@ -package org.mytang.brook.spring.boot.mybatis; +package xyz.mytang0.brook.spring.boot.mybatis; -import org.mytang.brook.common.metadata.definition.FlowDef; -import org.mytang.brook.common.utils.JsonUtils; -import org.mytang.brook.spi.annotation.FlowSelectedSPI; -import org.mytang.brook.spi.metadata.MetadataService; -import org.mytang.brook.spring.boot.mybatis.entity.FlowDefinition; -import org.mytang.brook.spring.boot.mybatis.mapper.FlowDefMapper; +import xyz.mytang0.brook.common.metadata.definition.FlowDef; +import xyz.mytang0.brook.common.utils.JsonUtils; +import xyz.mytang0.brook.spi.annotation.FlowSelectedSPI; +import xyz.mytang0.brook.spi.metadata.MetadataService; +import xyz.mytang0.brook.spring.boot.mybatis.entity.FlowDefinition; +import xyz.mytang0.brook.spring.boot.mybatis.mapper.FlowDefMapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/MysqlQueueService.java b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/MysqlQueueService.java similarity index 83% rename from brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/MysqlQueueService.java rename to brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/MysqlQueueService.java index 5079a3a..9d7f8b1 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/MysqlQueueService.java +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/MysqlQueueService.java @@ -1,10 +1,10 @@ -package org.mytang.brook.spring.boot.mybatis; +package xyz.mytang0.brook.spring.boot.mybatis; -import org.mytang.brook.common.metadata.model.QueueMessage; -import org.mytang.brook.common.utils.TimeUtils; -import org.mytang.brook.spi.annotation.FlowSelectedSPI; -import org.mytang.brook.spi.queue.QueueService; -import org.mytang.brook.spring.boot.mybatis.mapper.QueueMapper; +import xyz.mytang0.brook.common.metadata.model.QueueMessage; +import xyz.mytang0.brook.common.utils.TimeUtils; +import xyz.mytang0.brook.spi.annotation.FlowSelectedSPI; +import xyz.mytang0.brook.spi.queue.QueueService; +import xyz.mytang0.brook.spring.boot.mybatis.mapper.QueueMapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -29,7 +29,7 @@ public MysqlQueueService(QueueMapper queueMapper) { @Override public void offer(String queueName, QueueMessage message) { - org.mytang.brook.spring.boot.mybatis.entity.QueueMessage + xyz.mytang0.brook.spring.boot.mybatis.entity.QueueMessage queueMessage = convert(queueName, message); if (0 < queueMapper.insert(queueMessage)) { queueMapper.update(queueMessage); @@ -57,7 +57,7 @@ public List poll(String queueName, int count, long timeout, TimeUn long startTime = TimeUtils.currentTimeMillis(); long timeoutTime = startTime + unit.toMillis(timeout); - List messages + List messages = queueMapper.poll(queueName, startTime, count); long sleepFor = 500; @@ -79,7 +79,7 @@ public List poll(String queueName, int count, long timeout, TimeUn if (CollectionUtils.isNotEmpty(messages)) { int popped = queueMapper.popped(queueName, messages.stream().map( - org.mytang.brook.spring.boot.mybatis.entity.QueueMessage + xyz.mytang0.brook.spring.boot.mybatis.entity.QueueMessage ::getMessageId ).collect(Collectors.toList())); @@ -115,11 +115,11 @@ public void unacked(String queueName, long timePoint) { queueMapper.unacked(queueName, timePoint); } - private org.mytang.brook.spring.boot.mybatis.entity.QueueMessage convert( + private xyz.mytang0.brook.spring.boot.mybatis.entity.QueueMessage convert( String queueName, QueueMessage message) { - org.mytang.brook.spring.boot.mybatis.entity.QueueMessage queueMessage = - new org.mytang.brook.spring.boot.mybatis.entity.QueueMessage(); + xyz.mytang0.brook.spring.boot.mybatis.entity.QueueMessage queueMessage = + new xyz.mytang0.brook.spring.boot.mybatis.entity.QueueMessage(); queueMessage.setQueueName(queueName); queueMessage.setMessageId(message.getId()); queueMessage.setPriority(message.getPriority()); diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/autoconfigure/MysqlApplicationContextInitializer.java b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/autoconfigure/MysqlApplicationContextInitializer.java similarity index 96% rename from brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/autoconfigure/MysqlApplicationContextInitializer.java rename to brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/autoconfigure/MysqlApplicationContextInitializer.java index 533b646..5b8e47a 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/autoconfigure/MysqlApplicationContextInitializer.java +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/autoconfigure/MysqlApplicationContextInitializer.java @@ -1,6 +1,6 @@ -package org.mytang.brook.spring.boot.mybatis.autoconfigure; +package xyz.mytang0.brook.spring.boot.mybatis.autoconfigure; -import org.mytang.brook.spring.boot.mybatis.constants.TableNameConstants; +import xyz.mytang0.brook.spring.boot.mybatis.constants.TableNameConstants; import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.BooleanUtils; diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/autoconfigure/MysqlAutoConfiguration.java b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/autoconfigure/MysqlAutoConfiguration.java similarity index 89% rename from brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/autoconfigure/MysqlAutoConfiguration.java rename to brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/autoconfigure/MysqlAutoConfiguration.java index 54023a0..eaff400 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/autoconfigure/MysqlAutoConfiguration.java +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/autoconfigure/MysqlAutoConfiguration.java @@ -1,4 +1,4 @@ -package org.mytang.brook.spring.boot.mybatis.autoconfigure; +package xyz.mytang0.brook.spring.boot.mybatis.autoconfigure; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.autoconfigure.condition.AnyNestedCondition; @@ -9,8 +9,8 @@ import org.springframework.context.annotation.Configuration; @Configuration -@ComponentScan(basePackages = "org.mytang.brook.spring.boot.mybatis") -@MapperScan(basePackages = "org.mytang.brook.spring.boot.mybatis.mapper.**") +@ComponentScan(basePackages = "xyz.mytang0.brook.spring.boot.mybatis") +@MapperScan(basePackages = "xyz.mytang0.brook.spring.boot.mybatis.mapper.**") @Conditional(MysqlAutoConfiguration.EnableAnyCondition.class) public class MysqlAutoConfiguration { diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/autoconfigure/MysqlExecutionProperties.java b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/autoconfigure/MysqlExecutionProperties.java similarity index 57% rename from brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/autoconfigure/MysqlExecutionProperties.java rename to brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/autoconfigure/MysqlExecutionProperties.java index d979801..e5be1e2 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/autoconfigure/MysqlExecutionProperties.java +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/autoconfigure/MysqlExecutionProperties.java @@ -1,11 +1,11 @@ -package org.mytang.brook.spring.boot.mybatis.autoconfigure; +package xyz.mytang0.brook.spring.boot.mybatis.autoconfigure; import lombok.Data; -import static org.mytang.brook.spring.boot.mybatis.constants.TableNameConstants.DEFAULT_FLOW_PENDING_TABLE_NAME; -import static org.mytang.brook.spring.boot.mybatis.constants.TableNameConstants.DEFAULT_FLOW_TABLE_NAME; -import static org.mytang.brook.spring.boot.mybatis.constants.TableNameConstants.DEFAULT_TASK_PENDING_TABLE_NAME; -import static org.mytang.brook.spring.boot.mybatis.constants.TableNameConstants.DEFAULT_TASK_TABLE_NAME; +import static xyz.mytang0.brook.spring.boot.mybatis.constants.TableNameConstants.DEFAULT_FLOW_PENDING_TABLE_NAME; +import static xyz.mytang0.brook.spring.boot.mybatis.constants.TableNameConstants.DEFAULT_FLOW_TABLE_NAME; +import static xyz.mytang0.brook.spring.boot.mybatis.constants.TableNameConstants.DEFAULT_TASK_PENDING_TABLE_NAME; +import static xyz.mytang0.brook.spring.boot.mybatis.constants.TableNameConstants.DEFAULT_TASK_TABLE_NAME; @Data public class MysqlExecutionProperties { diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/autoconfigure/MysqlMetadataProperties.java b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/autoconfigure/MysqlMetadataProperties.java similarity index 61% rename from brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/autoconfigure/MysqlMetadataProperties.java rename to brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/autoconfigure/MysqlMetadataProperties.java index 19a3832..585050f 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/autoconfigure/MysqlMetadataProperties.java +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/autoconfigure/MysqlMetadataProperties.java @@ -1,7 +1,7 @@ -package org.mytang.brook.spring.boot.mybatis.autoconfigure; +package xyz.mytang0.brook.spring.boot.mybatis.autoconfigure; import lombok.Data; -import org.mytang.brook.spring.boot.mybatis.constants.TableNameConstants; +import xyz.mytang0.brook.spring.boot.mybatis.constants.TableNameConstants; @Data public class MysqlMetadataProperties { diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/autoconfigure/MysqlQueueProperties.java b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/autoconfigure/MysqlQueueProperties.java similarity index 54% rename from brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/autoconfigure/MysqlQueueProperties.java rename to brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/autoconfigure/MysqlQueueProperties.java index ed13edc..6e9c8f6 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/autoconfigure/MysqlQueueProperties.java +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/autoconfigure/MysqlQueueProperties.java @@ -1,8 +1,8 @@ -package org.mytang.brook.spring.boot.mybatis.autoconfigure; +package xyz.mytang0.brook.spring.boot.mybatis.autoconfigure; import lombok.Data; -import static org.mytang.brook.spring.boot.mybatis.constants.TableNameConstants.DEFAULT_QUEUE_TABLE_NAME; +import static xyz.mytang0.brook.spring.boot.mybatis.constants.TableNameConstants.DEFAULT_QUEUE_TABLE_NAME; @Data public class MysqlQueueProperties { diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/constants/TableNameConstants.java b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/constants/TableNameConstants.java similarity index 86% rename from brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/constants/TableNameConstants.java rename to brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/constants/TableNameConstants.java index a22716e..469f907 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/constants/TableNameConstants.java +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/constants/TableNameConstants.java @@ -1,4 +1,4 @@ -package org.mytang.brook.spring.boot.mybatis.constants; +package xyz.mytang0.brook.spring.boot.mybatis.constants; public interface TableNameConstants { diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/entity/BasicEntity.java b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/entity/BasicEntity.java similarity index 90% rename from brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/entity/BasicEntity.java rename to brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/entity/BasicEntity.java index 690cb93..f912116 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/entity/BasicEntity.java +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/entity/BasicEntity.java @@ -1,4 +1,4 @@ -package org.mytang.brook.spring.boot.mybatis.entity; +package xyz.mytang0.brook.spring.boot.mybatis.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/entity/Flow.java b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/entity/Flow.java similarity index 89% rename from brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/entity/Flow.java rename to brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/entity/Flow.java index 69fbdec..854ee8e 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/entity/Flow.java +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/entity/Flow.java @@ -1,4 +1,4 @@ -package org.mytang.brook.spring.boot.mybatis.entity; +package xyz.mytang0.brook.spring.boot.mybatis.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/entity/FlowDefinition.java b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/entity/FlowDefinition.java similarity index 88% rename from brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/entity/FlowDefinition.java rename to brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/entity/FlowDefinition.java index a48f72b..7649c69 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/entity/FlowDefinition.java +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/entity/FlowDefinition.java @@ -1,4 +1,4 @@ -package org.mytang.brook.spring.boot.mybatis.entity; +package xyz.mytang0.brook.spring.boot.mybatis.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/entity/FlowPending.java b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/entity/FlowPending.java similarity index 87% rename from brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/entity/FlowPending.java rename to brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/entity/FlowPending.java index 034450e..6bea84a 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/entity/FlowPending.java +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/entity/FlowPending.java @@ -1,4 +1,4 @@ -package org.mytang.brook.spring.boot.mybatis.entity; +package xyz.mytang0.brook.spring.boot.mybatis.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/entity/QueueMessage.java b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/entity/QueueMessage.java similarity index 89% rename from brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/entity/QueueMessage.java rename to brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/entity/QueueMessage.java index 0c5c903..84e33f7 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/entity/QueueMessage.java +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/entity/QueueMessage.java @@ -1,4 +1,4 @@ -package org.mytang.brook.spring.boot.mybatis.entity; +package xyz.mytang0.brook.spring.boot.mybatis.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/entity/Task.java b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/entity/Task.java similarity index 89% rename from brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/entity/Task.java rename to brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/entity/Task.java index ffa4302..affb80b 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/entity/Task.java +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/entity/Task.java @@ -1,4 +1,4 @@ -package org.mytang.brook.spring.boot.mybatis.entity; +package xyz.mytang0.brook.spring.boot.mybatis.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/entity/TaskPending.java b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/entity/TaskPending.java similarity index 88% rename from brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/entity/TaskPending.java rename to brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/entity/TaskPending.java index c9e2605..341b5f3 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/entity/TaskPending.java +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/entity/TaskPending.java @@ -1,4 +1,4 @@ -package org.mytang.brook.spring.boot.mybatis.entity; +package xyz.mytang0.brook.spring.boot.mybatis.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/mapper/FlowDefMapper.java b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/mapper/FlowDefMapper.java similarity index 59% rename from brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/mapper/FlowDefMapper.java rename to brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/mapper/FlowDefMapper.java index cb2de0e..120f1e2 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/mapper/FlowDefMapper.java +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/mapper/FlowDefMapper.java @@ -1,7 +1,7 @@ -package org.mytang.brook.spring.boot.mybatis.mapper; +package xyz.mytang0.brook.spring.boot.mybatis.mapper; -import org.mytang.brook.spring.boot.mybatis.entity.FlowDefinition; +import xyz.mytang0.brook.spring.boot.mybatis.entity.FlowDefinition; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/mapper/FlowMapper.java b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/mapper/FlowMapper.java similarity index 79% rename from brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/mapper/FlowMapper.java rename to brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/mapper/FlowMapper.java index 5969d69..2fc52de 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/mapper/FlowMapper.java +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/mapper/FlowMapper.java @@ -1,6 +1,6 @@ -package org.mytang.brook.spring.boot.mybatis.mapper; +package xyz.mytang0.brook.spring.boot.mybatis.mapper; -import org.mytang.brook.spring.boot.mybatis.entity.Flow; +import xyz.mytang0.brook.spring.boot.mybatis.entity.Flow; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/mapper/FlowPendingMapper.java b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/mapper/FlowPendingMapper.java similarity index 75% rename from brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/mapper/FlowPendingMapper.java rename to brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/mapper/FlowPendingMapper.java index d2e21f9..2f6037b 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/mapper/FlowPendingMapper.java +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/mapper/FlowPendingMapper.java @@ -1,6 +1,6 @@ -package org.mytang.brook.spring.boot.mybatis.mapper; +package xyz.mytang0.brook.spring.boot.mybatis.mapper; -import org.mytang.brook.spring.boot.mybatis.entity.FlowPending; +import xyz.mytang0.brook.spring.boot.mybatis.entity.FlowPending; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/mapper/QueueMapper.java b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/mapper/QueueMapper.java similarity index 89% rename from brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/mapper/QueueMapper.java rename to brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/mapper/QueueMapper.java index 8d24441..365181c 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/mapper/QueueMapper.java +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/mapper/QueueMapper.java @@ -1,7 +1,7 @@ -package org.mytang.brook.spring.boot.mybatis.mapper; +package xyz.mytang0.brook.spring.boot.mybatis.mapper; -import org.mytang.brook.spring.boot.mybatis.entity.QueueMessage; +import xyz.mytang0.brook.spring.boot.mybatis.entity.QueueMessage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/mapper/TaskMapper.java b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/mapper/TaskMapper.java similarity index 84% rename from brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/mapper/TaskMapper.java rename to brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/mapper/TaskMapper.java index d31bdab..0baa2da 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/mapper/TaskMapper.java +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/mapper/TaskMapper.java @@ -1,7 +1,7 @@ -package org.mytang.brook.spring.boot.mybatis.mapper; +package xyz.mytang0.brook.spring.boot.mybatis.mapper; -import org.mytang.brook.spring.boot.mybatis.entity.Task; +import xyz.mytang0.brook.spring.boot.mybatis.entity.Task; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/mapper/TaskPendingMapper.java b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/mapper/TaskPendingMapper.java similarity index 78% rename from brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/mapper/TaskPendingMapper.java rename to brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/mapper/TaskPendingMapper.java index 9cd6ffb..eac8516 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/org/mytang/brook/spring/boot/mybatis/mapper/TaskPendingMapper.java +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/java/xyz/mytang0/brook/spring/boot/mybatis/mapper/TaskPendingMapper.java @@ -1,6 +1,6 @@ -package org.mytang.brook.spring.boot.mybatis.mapper; +package xyz.mytang0.brook.spring.boot.mybatis.mapper; -import org.mytang.brook.spring.boot.mybatis.entity.TaskPending; +import xyz.mytang0.brook.spring.boot.mybatis.entity.TaskPending; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/resources/META-INF/spring.factories b/brook-spring-boot/brook-spring-boot-mybatis/src/main/resources/META-INF/spring.factories index cd66ea8..314f6c9 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/resources/META-INF/spring.factories +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/resources/META-INF/spring.factories @@ -1,4 +1,4 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.mytang.brook.spring.boot.mybatis.autoconfigure.MysqlAutoConfiguration + xyz.mytang0.brook.spring.boot.mybatis.autoconfigure.MysqlAutoConfiguration org.springframework.context.ApplicationContextInitializer=\ - org.mytang.brook.spring.boot.mybatis.autoconfigure.MysqlApplicationContextInitializer + xyz.mytang0.brook.spring.boot.mybatis.autoconfigure.MysqlApplicationContextInitializer diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/resources/mapper/FlowMapper.xml b/brook-spring-boot/brook-spring-boot-mybatis/src/main/resources/mapper/FlowMapper.xml index 1c3afee..2e39168 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/resources/mapper/FlowMapper.xml +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/resources/mapper/FlowMapper.xml @@ -1,19 +1,19 @@ - - + + INSERT IGNORE INTO ${executionDaoFlowTableName}(`flow_id`,`flow_name`,`flow_version`,`correlation_id`,`json_data`) VALUES (#{flowId},#{flowName},#{flowVersion},#{correlationId},#{jsonData}) - SELECT `id`,`flow_id`,`flow_name`,`flow_version`,`correlation_id`,`json_data`,`r_add_time`,`r_modified_time` FROM ${executionDaoFlowTableName} WHERE `flow_id`=#{flowId} - SELECT `id`,`flow_id`,`flow_name`,`flow_version`,`correlation_id`,`json_data`,`r_add_time`,`r_modified_time` FROM ${executionDaoFlowTableName} WHERE `correlation_id`=#{correlationId} - + UPDATE ${executionDaoFlowTableName} SET `json_data`= #{jsonData} WHERE `flow_id`=#{flowId} diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/resources/mapper/FlowPendingMapper.xml b/brook-spring-boot/brook-spring-boot-mybatis/src/main/resources/mapper/FlowPendingMapper.xml index e26ce47..5868a46 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/resources/mapper/FlowPendingMapper.xml +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/resources/mapper/FlowPendingMapper.xml @@ -1,7 +1,7 @@ - - + + INSERT IGNORE INTO ${executionDaoFlowPendingTableName}(`flow_id`,`flow_name`) VALUES (#{flowId},#{flowName}) diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/resources/mapper/QueueMapper.xml b/brook-spring-boot/brook-spring-boot-mybatis/src/main/resources/mapper/QueueMapper.xml index 8b2ba2a..b411c2a 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/resources/mapper/QueueMapper.xml +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/resources/mapper/QueueMapper.xml @@ -1,7 +1,7 @@ - - + + INSERT IGNORE INTO ${queueTableName}(`queue_name`,`message_id`,`priority`,`delivery_time`,`payload`) VALUES (#{queueName},#{messageId},#{priority},#{deliveryTime},#{payload}) @@ -16,7 +16,7 @@ SELECT MIN(`delivery_time`) FROM ${queueTableName} WHERE `queue_name`=#{queueName} - + UPDATE ${queueTableName} SET `priority`=#{priority},`delivery_time`=#{deliveryTime},`payload`=#{payload} WHERE `queue_name`=#{queueName} AND `message_id`=#{messageId} @@ -31,7 +31,7 @@ - SELECT `queue_name`,`message_id`,`priority`,`delivery_time`,`payload` FROM ${queueTableName} WHERE `queue_name`=#{queueName} AND `delivery_time`<=#{deliveryTime} AND `popped`=0 ORDER BY `delivery_time` LIMIT #{maxCount} diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/resources/mapper/TaskMapper.xml b/brook-spring-boot/brook-spring-boot-mybatis/src/main/resources/mapper/TaskMapper.xml index 4378591..b5c7765 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/resources/mapper/TaskMapper.xml +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/resources/mapper/TaskMapper.xml @@ -1,23 +1,23 @@ - - + + INSERT IGNORE INTO ${executionDaoTaskTableName}(`task_id`,`task_name`,`flow_id`,`json_def`,`json_data`) VALUES (#{taskId},#{taskName},#{flowId},#{jsonDef},#{jsonData}) - SELECT `id`,`task_id`,`task_name`,`flow_id`,`json_def`,`json_data`,`r_add_time`,`r_modified_time` FROM ${executionDaoTaskTableName} WHERE `task_id`=#{taskId} - SELECT `id`,`task_id`,`task_name`,`flow_id`,`json_def`,`json_data`,`r_add_time`,`r_modified_time` FROM ${executionDaoTaskTableName} WHERE `flow_id`=#{flowId} ORDER BY `id` - SELECT `id`,`task_id`,`task_name`,`flow_id`,`json_def`,`json_data`,`r_add_time`,`r_modified_time` FROM ${executionDaoTaskTableName} WHERE `flow_id`=#{flowId} and `task_name`=#{taskName} - + UPDATE ${executionDaoTaskTableName} SET `json_data`= #{jsonData} WHERE `task_id`=#{taskId} diff --git a/brook-spring-boot/brook-spring-boot-mybatis/src/main/resources/mapper/TaskPendingMapper.xml b/brook-spring-boot/brook-spring-boot-mybatis/src/main/resources/mapper/TaskPendingMapper.xml index 999af51..c1beef4 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/src/main/resources/mapper/TaskPendingMapper.xml +++ b/brook-spring-boot/brook-spring-boot-mybatis/src/main/resources/mapper/TaskPendingMapper.xml @@ -1,7 +1,7 @@ - - + + INSERT IGNORE INTO ${executionDaoTaskPendingTableName}(`task_id`,`task_name`,`flow_id`) VALUES (#{taskId},#{taskName},#{flowId}) diff --git a/brook-spring-boot/brook-spring-boot-starter/pom.xml b/brook-spring-boot/brook-spring-boot-starter/pom.xml index 77d0efb..092394d 100644 --- a/brook-spring-boot/brook-spring-boot-starter/pom.xml +++ b/brook-spring-boot/brook-spring-boot-starter/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.mytang.brook + xyz.mytang0.brook brook-spring-boot ${revision} ../pom.xml @@ -28,7 +28,7 @@ - org.mytang.brook + xyz.mytang0.brook brook-spring-boot-autoconfigure ${project.version} diff --git a/brook-spring-boot/pom.xml b/brook-spring-boot/pom.xml index f7649d8..626d84f 100644 --- a/brook-spring-boot/pom.xml +++ b/brook-spring-boot/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.mytang.brook + xyz.mytang0.brook brook-parent ${revision} ../pom.xml diff --git a/codestyle/codestyle_for_idea.xml b/codestyle/codestyle_for_idea.xml index 2128d5e..992d080 100644 --- a/codestyle/codestyle_for_idea.xml +++ b/codestyle/codestyle_for_idea.xml @@ -3,7 +3,7 @@ - org.mytang.brook + xyz.mytang0.brook brook-parent ${revision} pom @@ -99,6 +99,8 @@ 3.0.1 4.3.0 3.2.1 + 3.0.1 + 1.6 true @@ -109,7 +111,7 @@ - all + release false @@ -139,6 +141,40 @@ + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + true + false + all,-missing + + + + attach-javadocs + + jar + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + ${maven-gpg-plugin.version} + + + sign-artifacts + verify + + sign + + + +