You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2022/12/29 16:58:34 UTC
[shardingsphere] branch master updated: Rename shardingsphere-agent-bootstrap to shardingsphere-agent-core (#23174)
This is an automated email from the ASF dual-hosted git repository.
sunnianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 3732118fc9a Rename shardingsphere-agent-bootstrap to shardingsphere-agent-core (#23174)
3732118fc9a is described below
commit 3732118fc9a46369ca3a7c01cc3d45c238e9037c
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Dec 30 00:58:28 2022 +0800
Rename shardingsphere-agent-bootstrap to shardingsphere-agent-core (#23174)
---
agent/{bootstrap => core}/pom.xml | 4 ++--
.../shardingsphere/agent/core}/ShardingSphereAgent.java | 16 ++++++++--------
.../agent/core}/classloader/AgentClassLoader.java | 6 +++---
.../agent/core}/classloader/ClassLoaderContext.java | 4 ++--
.../core}/config/loader/PluginConfigurationLoader.java | 8 ++++----
.../yaml/entity/YamlPluginCategoryConfiguration.java | 2 +-
.../config/yaml/entity/YamlPluginConfiguration.java | 2 +-
.../config/yaml/entity/YamlPluginsConfiguration.java | 2 +-
.../yaml/swapper/YamlPluginsConfigurationSwapper.java | 8 ++++----
.../agent/core}/logging/LoggerFactory.java | 6 +++---
.../agent/core}/logging/LoggingListener.java | 4 ++--
.../agent/core}/path/AgentPathBuilder.java | 2 +-
.../agent/core}/plugin/PluginBootServiceManager.java | 8 ++++----
.../shardingsphere/agent/core}/plugin/PluginContext.java | 2 +-
.../shardingsphere/agent/core}/plugin/PluginJar.java | 2 +-
.../plugin/advisor/AdvisorConfigurationRegistry.java | 2 +-
.../advisor/AdvisorConfigurationRegistryFactory.java | 2 +-
.../agent/core}/plugin/executor/AdviceExecutor.java | 2 +-
.../plugin/executor/type/ConstructorAdviceExecutor.java | 10 +++++-----
.../executor/type/InstanceMethodAdviceExecutor.java | 10 +++++-----
.../plugin/executor/type/StaticMethodAdviceExecutor.java | 10 +++++-----
.../core}/plugin/loader/AdvisorConfigurationLoader.java | 14 +++++++-------
.../agent/core}/plugin/loader/AgentPluginLoader.java | 10 +++++-----
.../plugin/yaml/entity/YamlAdvisorConfiguration.java | 2 +-
.../plugin/yaml/entity/YamlAdvisorsConfiguration.java | 2 +-
.../plugin/yaml/entity/YamlPointcutConfiguration.java | 2 +-
.../yaml/entity/YamlPointcutParameterConfiguration.java | 2 +-
.../yaml/loader/YamlAdvisorsConfigurationLoader.java | 4 ++--
.../yaml/swapper/YamlAdvisorConfigurationSwapper.java | 8 ++++----
.../yaml/swapper/YamlAdvisorsConfigurationSwapper.java | 6 +++---
.../yaml/swapper/YamlPointcutConfigurationSwapper.java | 6 +++---
.../agent/core}/spi/AgentServiceLoader.java | 2 +-
.../agent/core}/spi/PluginBootServiceRegistry.java | 2 +-
.../agent/core}/transformer/AgentJunction.java | 2 +-
.../agent/core}/transformer/AgentTransformer.java | 12 ++++++------
.../agent/core}/transformer/MethodAdvisor.java | 4 ++--
.../core}/transformer/builder/MethodAdvisorBuilder.java | 16 ++++++++--------
.../core}/transformer/builder/advise/AdviceFactory.java | 4 ++--
.../config/loader/PluginConfigurationLoaderTest.java | 4 ++--
.../advisor/AdvisorConfigurationRegistryFactoryTest.java | 2 +-
.../plugin/advisor/AdvisorConfigurationRegistryTest.java | 2 +-
.../core}/plugin/yaml/fixture/YamlAdviceFixture.java | 2 +-
.../plugin/yaml/fixture/YamlTargetObjectFixture.java | 2 +-
.../yaml/loader/YamlAdvisorsConfigurationLoaderTest.java | 10 +++++-----
.../swapper/YamlAdvisorsConfigurationSwapperTest.java | 8 ++++----
.../agent/core}/transformer/AgentTransformerTest.java | 12 ++++++------
.../core}/transformer/fixture/advice/BarAdvice.java | 2 +-
.../core}/transformer/fixture/advice/FooAdvice.java | 2 +-
.../fixture/targeted/TargetObjectFixture.java | 2 +-
.../src/test/resources/conf/advisors.yaml | 0
.../src/test/resources/conf/agent.yaml | 0
.../src/test/resources/conf/empty-advisors.yaml | 0
.../src/test/resources/logback-test.xml | 0
agent/distribution/pom.xml | 2 +-
.../shardingsphere-agent-binary-distribution.xml | 2 +-
agent/pom.xml | 3 ++-
56 files changed, 133 insertions(+), 132 deletions(-)
diff --git a/agent/bootstrap/pom.xml b/agent/core/pom.xml
similarity index 97%
rename from agent/bootstrap/pom.xml
rename to agent/core/pom.xml
index e8560da451f..d042cf2d9b0 100644
--- a/agent/bootstrap/pom.xml
+++ b/agent/core/pom.xml
@@ -24,11 +24,11 @@
<artifactId>shardingsphere-agent</artifactId>
<version>5.3.1-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-agent-bootstrap</artifactId>
+ <artifactId>shardingsphere-agent-core</artifactId>
<name>${project.artifactId}</name>
<properties>
- <premain.class>org.apache.shardingsphere.agent.bootstrap.ShardingSphereAgent</premain.class>
+ <premain.class>org.apache.shardingsphere.agent.core.ShardingSphereAgent</premain.class>
</properties>
<dependencies>
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/ShardingSphereAgent.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/ShardingSphereAgent.java
similarity index 84%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/ShardingSphereAgent.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/ShardingSphereAgent.java
index a7ad053a11d..59def2e88f0 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/ShardingSphereAgent.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/ShardingSphereAgent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap;
+package org.apache.shardingsphere.agent.core;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@@ -23,13 +23,13 @@ import net.bytebuddy.ByteBuddy;
import net.bytebuddy.agent.builder.AgentBuilder;
import net.bytebuddy.dynamic.scaffold.TypeValidation;
import net.bytebuddy.matcher.ElementMatchers;
-import org.apache.shardingsphere.agent.bootstrap.config.loader.PluginConfigurationLoader;
-import org.apache.shardingsphere.agent.bootstrap.logging.LoggingListener;
-import org.apache.shardingsphere.agent.bootstrap.plugin.PluginJar;
-import org.apache.shardingsphere.agent.bootstrap.plugin.loader.AdvisorConfigurationLoader;
-import org.apache.shardingsphere.agent.bootstrap.plugin.loader.AgentPluginLoader;
-import org.apache.shardingsphere.agent.bootstrap.transformer.AgentJunction;
-import org.apache.shardingsphere.agent.bootstrap.transformer.AgentTransformer;
+import org.apache.shardingsphere.agent.core.config.loader.PluginConfigurationLoader;
+import org.apache.shardingsphere.agent.core.logging.LoggingListener;
+import org.apache.shardingsphere.agent.core.plugin.PluginJar;
+import org.apache.shardingsphere.agent.core.plugin.loader.AdvisorConfigurationLoader;
+import org.apache.shardingsphere.agent.core.plugin.loader.AgentPluginLoader;
+import org.apache.shardingsphere.agent.core.transformer.AgentJunction;
+import org.apache.shardingsphere.agent.core.transformer.AgentTransformer;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.config.plugin.PluginConfiguration;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/classloader/AgentClassLoader.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/classloader/AgentClassLoader.java
similarity index 96%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/classloader/AgentClassLoader.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/classloader/AgentClassLoader.java
index dd53f19ec99..65cb6d737a6 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/classloader/AgentClassLoader.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/classloader/AgentClassLoader.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.classloader;
+package org.apache.shardingsphere.agent.core.classloader;
import com.google.common.io.ByteStreams;
import lombok.Getter;
-import org.apache.shardingsphere.agent.bootstrap.plugin.PluginJar;
-import org.apache.shardingsphere.agent.bootstrap.plugin.loader.AgentPluginLoader;
+import org.apache.shardingsphere.agent.core.plugin.PluginJar;
+import org.apache.shardingsphere.agent.core.plugin.loader.AgentPluginLoader;
import java.io.IOException;
import java.net.MalformedURLException;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/classloader/ClassLoaderContext.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/classloader/ClassLoaderContext.java
similarity index 92%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/classloader/ClassLoaderContext.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/classloader/ClassLoaderContext.java
index 12b18c806c2..fb2d1a5efa4 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/classloader/ClassLoaderContext.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/classloader/ClassLoaderContext.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.classloader;
+package org.apache.shardingsphere.agent.core.classloader;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.agent.bootstrap.plugin.PluginJar;
+import org.apache.shardingsphere.agent.core.plugin.PluginJar;
import java.util.Collection;
import java.util.Map;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/config/loader/PluginConfigurationLoader.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/loader/PluginConfigurationLoader.java
similarity index 87%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/config/loader/PluginConfigurationLoader.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/loader/PluginConfigurationLoader.java
index afb8c21f0aa..ea55577c3f9 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/config/loader/PluginConfigurationLoader.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/loader/PluginConfigurationLoader.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.config.loader;
+package org.apache.shardingsphere.agent.core.config.loader;
import com.google.common.base.Preconditions;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.agent.bootstrap.config.yaml.entity.YamlPluginsConfiguration;
-import org.apache.shardingsphere.agent.bootstrap.config.yaml.swapper.YamlPluginsConfigurationSwapper;
-import org.apache.shardingsphere.agent.bootstrap.path.AgentPathBuilder;
+import org.apache.shardingsphere.agent.core.config.yaml.entity.YamlPluginsConfiguration;
+import org.apache.shardingsphere.agent.core.config.yaml.swapper.YamlPluginsConfigurationSwapper;
+import org.apache.shardingsphere.agent.core.path.AgentPathBuilder;
import org.apache.shardingsphere.agent.config.plugin.PluginConfiguration;
import org.yaml.snakeyaml.Yaml;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/config/yaml/entity/YamlPluginCategoryConfiguration.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/entity/YamlPluginCategoryConfiguration.java
similarity index 94%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/config/yaml/entity/YamlPluginCategoryConfiguration.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/entity/YamlPluginCategoryConfiguration.java
index 7e33f1c92b3..be0253729b9 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/config/yaml/entity/YamlPluginCategoryConfiguration.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/entity/YamlPluginCategoryConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.config.yaml.entity;
+package org.apache.shardingsphere.agent.core.config.yaml.entity;
import lombok.Getter;
import lombok.Setter;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/config/yaml/entity/YamlPluginConfiguration.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/entity/YamlPluginConfiguration.java
similarity index 94%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/config/yaml/entity/YamlPluginConfiguration.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/entity/YamlPluginConfiguration.java
index 1b2b9f88dd7..9701152f217 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/config/yaml/entity/YamlPluginConfiguration.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/entity/YamlPluginConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.config.yaml.entity;
+package org.apache.shardingsphere.agent.core.config.yaml.entity;
import lombok.Getter;
import lombok.Setter;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/config/yaml/entity/YamlPluginsConfiguration.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/entity/YamlPluginsConfiguration.java
similarity index 93%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/config/yaml/entity/YamlPluginsConfiguration.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/entity/YamlPluginsConfiguration.java
index b8450218486..24f10644057 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/config/yaml/entity/YamlPluginsConfiguration.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/entity/YamlPluginsConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.config.yaml.entity;
+package org.apache.shardingsphere.agent.core.config.yaml.entity;
import lombok.Getter;
import lombok.Setter;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/config/yaml/swapper/YamlPluginsConfigurationSwapper.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/swapper/YamlPluginsConfigurationSwapper.java
similarity index 88%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/config/yaml/swapper/YamlPluginsConfigurationSwapper.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/swapper/YamlPluginsConfigurationSwapper.java
index d6afebceabb..af7097da6e3 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/config/yaml/swapper/YamlPluginsConfigurationSwapper.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/swapper/YamlPluginsConfigurationSwapper.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.config.yaml.swapper;
+package org.apache.shardingsphere.agent.core.config.yaml.swapper;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.agent.bootstrap.config.yaml.entity.YamlPluginCategoryConfiguration;
-import org.apache.shardingsphere.agent.bootstrap.config.yaml.entity.YamlPluginConfiguration;
-import org.apache.shardingsphere.agent.bootstrap.config.yaml.entity.YamlPluginsConfiguration;
+import org.apache.shardingsphere.agent.core.config.yaml.entity.YamlPluginCategoryConfiguration;
+import org.apache.shardingsphere.agent.core.config.yaml.entity.YamlPluginConfiguration;
+import org.apache.shardingsphere.agent.core.config.yaml.entity.YamlPluginsConfiguration;
import org.apache.shardingsphere.agent.config.plugin.PluginConfiguration;
import java.util.LinkedHashMap;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/logging/LoggerFactory.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/logging/LoggerFactory.java
similarity index 95%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/logging/LoggerFactory.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/logging/LoggerFactory.java
index 72efb11ac14..c61f4c48edf 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/logging/LoggerFactory.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/logging/LoggerFactory.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.logging;
+package org.apache.shardingsphere.agent.core.logging;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.agent.bootstrap.classloader.AgentClassLoader;
-import org.apache.shardingsphere.agent.bootstrap.plugin.PluginJar;
+import org.apache.shardingsphere.agent.core.classloader.AgentClassLoader;
+import org.apache.shardingsphere.agent.core.plugin.PluginJar;
import java.io.File;
import java.io.IOException;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/logging/LoggingListener.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/logging/LoggingListener.java
similarity index 94%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/logging/LoggingListener.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/logging/LoggingListener.java
index 36118f231d2..218f353d7c7 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/logging/LoggingListener.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/logging/LoggingListener.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.logging;
+package org.apache.shardingsphere.agent.core.logging;
import net.bytebuddy.agent.builder.AgentBuilder.Listener;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.dynamic.DynamicType;
import net.bytebuddy.utility.JavaModule;
-import org.apache.shardingsphere.agent.bootstrap.logging.LoggerFactory.Logger;
+import org.apache.shardingsphere.agent.core.logging.LoggerFactory.Logger;
/**
* Logging listener for ByteBuddy lifecycle.
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/path/AgentPathBuilder.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/path/AgentPathBuilder.java
similarity index 98%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/path/AgentPathBuilder.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/path/AgentPathBuilder.java
index d5d26781353..7bf5e5a47e2 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/path/AgentPathBuilder.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/path/AgentPathBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.path;
+package org.apache.shardingsphere.agent.core.path;
import com.google.common.base.Preconditions;
import lombok.AccessLevel;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/PluginBootServiceManager.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginBootServiceManager.java
similarity index 91%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/PluginBootServiceManager.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginBootServiceManager.java
index dde5f96d2a9..69f7d0faa3b 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/PluginBootServiceManager.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginBootServiceManager.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.plugin;
+package org.apache.shardingsphere.agent.core.plugin;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.agent.bootstrap.spi.PluginBootServiceRegistry;
+import org.apache.shardingsphere.agent.core.spi.PluginBootServiceRegistry;
import org.apache.shardingsphere.agent.config.plugin.PluginConfiguration;
-import org.apache.shardingsphere.agent.bootstrap.logging.LoggerFactory;
-import org.apache.shardingsphere.agent.bootstrap.logging.LoggerFactory.Logger;
+import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
+import org.apache.shardingsphere.agent.core.logging.LoggerFactory.Logger;
import java.io.IOException;
import java.util.Collection;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/PluginContext.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginContext.java
similarity index 95%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/PluginContext.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginContext.java
index bc2ae6567a7..5b4d70c3f93 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/PluginContext.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginContext.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.plugin;
+package org.apache.shardingsphere.agent.core.plugin;
/**
* Plugin Context.
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/PluginJar.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginJar.java
similarity index 94%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/PluginJar.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginJar.java
index fe23dc16f6f..0e55765ef39 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/PluginJar.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginJar.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.plugin;
+package org.apache.shardingsphere.agent.core.plugin;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/advisor/AdvisorConfigurationRegistry.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistry.java
similarity index 95%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/advisor/AdvisorConfigurationRegistry.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistry.java
index 8a924465303..96b4dc82a31 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/advisor/AdvisorConfigurationRegistry.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistry.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.plugin.advisor;
+package org.apache.shardingsphere.agent.core.plugin.advisor;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/advisor/AdvisorConfigurationRegistryFactory.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryFactory.java
similarity index 95%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/advisor/AdvisorConfigurationRegistryFactory.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryFactory.java
index f2bba41a1bb..adc305540bb 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/advisor/AdvisorConfigurationRegistryFactory.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.plugin.advisor;
+package org.apache.shardingsphere.agent.core.plugin.advisor;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/executor/AdviceExecutor.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/AdviceExecutor.java
similarity index 94%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/executor/AdviceExecutor.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/AdviceExecutor.java
index d12eb7cef0c..502d3819069 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/executor/AdviceExecutor.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/AdviceExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.plugin.executor;
+package org.apache.shardingsphere.agent.core.plugin.executor;
import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.dynamic.DynamicType.Builder;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/executor/type/ConstructorAdviceExecutor.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/ConstructorAdviceExecutor.java
similarity index 88%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/executor/type/ConstructorAdviceExecutor.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/ConstructorAdviceExecutor.java
index 5cda3660b39..301c8dfcb10 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/executor/type/ConstructorAdviceExecutor.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/ConstructorAdviceExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.plugin.executor.type;
+package org.apache.shardingsphere.agent.core.plugin.executor.type;
import lombok.RequiredArgsConstructor;
import net.bytebuddy.description.method.MethodDescription;
@@ -28,10 +28,10 @@ import net.bytebuddy.implementation.bind.annotation.This;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.advice.TargetAdviceObject;
import org.apache.shardingsphere.agent.advice.type.ConstructorAdvice;
-import org.apache.shardingsphere.agent.bootstrap.logging.LoggerFactory;
-import org.apache.shardingsphere.agent.bootstrap.logging.LoggerFactory.Logger;
-import org.apache.shardingsphere.agent.bootstrap.plugin.PluginContext;
-import org.apache.shardingsphere.agent.bootstrap.plugin.executor.AdviceExecutor;
+import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
+import org.apache.shardingsphere.agent.core.logging.LoggerFactory.Logger;
+import org.apache.shardingsphere.agent.core.plugin.PluginContext;
+import org.apache.shardingsphere.agent.core.plugin.executor.AdviceExecutor;
import java.util.Collection;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/executor/type/InstanceMethodAdviceExecutor.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/InstanceMethodAdviceExecutor.java
similarity index 92%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/executor/type/InstanceMethodAdviceExecutor.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/InstanceMethodAdviceExecutor.java
index 92158b17a40..cfde9e5d604 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/executor/type/InstanceMethodAdviceExecutor.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/InstanceMethodAdviceExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.plugin.executor.type;
+package org.apache.shardingsphere.agent.core.plugin.executor.type;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
@@ -30,10 +30,10 @@ import net.bytebuddy.implementation.bind.annotation.This;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.advice.TargetAdviceObject;
import org.apache.shardingsphere.agent.advice.type.InstanceMethodAdvice;
-import org.apache.shardingsphere.agent.bootstrap.plugin.executor.AdviceExecutor;
-import org.apache.shardingsphere.agent.bootstrap.logging.LoggerFactory;
-import org.apache.shardingsphere.agent.bootstrap.logging.LoggerFactory.Logger;
-import org.apache.shardingsphere.agent.bootstrap.plugin.PluginContext;
+import org.apache.shardingsphere.agent.core.plugin.executor.AdviceExecutor;
+import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
+import org.apache.shardingsphere.agent.core.logging.LoggerFactory.Logger;
+import org.apache.shardingsphere.agent.core.plugin.PluginContext;
import java.lang.reflect.Method;
import java.util.Collection;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/executor/type/StaticMethodAdviceExecutor.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/StaticMethodAdviceExecutor.java
similarity index 92%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/executor/type/StaticMethodAdviceExecutor.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/StaticMethodAdviceExecutor.java
index 9589f016e70..d9444a3eb68 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/executor/type/StaticMethodAdviceExecutor.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/StaticMethodAdviceExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.plugin.executor.type;
+package org.apache.shardingsphere.agent.core.plugin.executor.type;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
@@ -28,10 +28,10 @@ import net.bytebuddy.implementation.bind.annotation.RuntimeType;
import net.bytebuddy.implementation.bind.annotation.SuperCall;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.advice.type.StaticMethodAdvice;
-import org.apache.shardingsphere.agent.bootstrap.logging.LoggerFactory;
-import org.apache.shardingsphere.agent.bootstrap.logging.LoggerFactory.Logger;
-import org.apache.shardingsphere.agent.bootstrap.plugin.PluginContext;
-import org.apache.shardingsphere.agent.bootstrap.plugin.executor.AdviceExecutor;
+import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
+import org.apache.shardingsphere.agent.core.logging.LoggerFactory.Logger;
+import org.apache.shardingsphere.agent.core.plugin.PluginContext;
+import org.apache.shardingsphere.agent.core.plugin.executor.AdviceExecutor;
import java.lang.reflect.Method;
import java.util.Collection;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/loader/AdvisorConfigurationLoader.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/loader/AdvisorConfigurationLoader.java
similarity index 86%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/loader/AdvisorConfigurationLoader.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/loader/AdvisorConfigurationLoader.java
index 2f70121bc18..e67363fcf3f 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/loader/AdvisorConfigurationLoader.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/loader/AdvisorConfigurationLoader.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.plugin.loader;
+package org.apache.shardingsphere.agent.core.plugin.loader;
import com.google.common.collect.ImmutableMap;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.agent.bootstrap.classloader.AgentClassLoader;
-import org.apache.shardingsphere.agent.bootstrap.logging.LoggerFactory;
-import org.apache.shardingsphere.agent.bootstrap.logging.LoggerFactory.Logger;
-import org.apache.shardingsphere.agent.bootstrap.plugin.PluginJar;
-import org.apache.shardingsphere.agent.bootstrap.plugin.yaml.loader.YamlAdvisorsConfigurationLoader;
-import org.apache.shardingsphere.agent.bootstrap.plugin.yaml.swapper.YamlAdvisorsConfigurationSwapper;
+import org.apache.shardingsphere.agent.core.classloader.AgentClassLoader;
+import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
+import org.apache.shardingsphere.agent.core.logging.LoggerFactory.Logger;
+import org.apache.shardingsphere.agent.core.plugin.PluginJar;
+import org.apache.shardingsphere.agent.core.plugin.yaml.loader.YamlAdvisorsConfigurationLoader;
+import org.apache.shardingsphere.agent.core.plugin.yaml.swapper.YamlAdvisorsConfigurationSwapper;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import java.io.InputStream;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/loader/AgentPluginLoader.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/loader/AgentPluginLoader.java
similarity index 86%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/loader/AgentPluginLoader.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/loader/AgentPluginLoader.java
index 80d2f2e04d3..985ecd6fa96 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/loader/AgentPluginLoader.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/loader/AgentPluginLoader.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.plugin.loader;
+package org.apache.shardingsphere.agent.core.plugin.loader;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.agent.bootstrap.logging.LoggerFactory;
-import org.apache.shardingsphere.agent.bootstrap.logging.LoggerFactory.Logger;
-import org.apache.shardingsphere.agent.bootstrap.path.AgentPathBuilder;
-import org.apache.shardingsphere.agent.bootstrap.plugin.PluginJar;
+import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
+import org.apache.shardingsphere.agent.core.logging.LoggerFactory.Logger;
+import org.apache.shardingsphere.agent.core.path.AgentPathBuilder;
+import org.apache.shardingsphere.agent.core.plugin.PluginJar;
import java.io.File;
import java.io.IOException;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/entity/YamlAdvisorConfiguration.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlAdvisorConfiguration.java
similarity index 94%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/entity/YamlAdvisorConfiguration.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlAdvisorConfiguration.java
index 0bd8f4d535d..83b26d42557 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/entity/YamlAdvisorConfiguration.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlAdvisorConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.plugin.yaml.entity;
+package org.apache.shardingsphere.agent.core.plugin.yaml.entity;
import lombok.Getter;
import lombok.Setter;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/entity/YamlAdvisorsConfiguration.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlAdvisorsConfiguration.java
similarity index 94%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/entity/YamlAdvisorsConfiguration.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlAdvisorsConfiguration.java
index 06455f603e6..68d054e5a01 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/entity/YamlAdvisorsConfiguration.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlAdvisorsConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.plugin.yaml.entity;
+package org.apache.shardingsphere.agent.core.plugin.yaml.entity;
import lombok.Getter;
import lombok.Setter;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/entity/YamlPointcutConfiguration.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlPointcutConfiguration.java
similarity index 94%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/entity/YamlPointcutConfiguration.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlPointcutConfiguration.java
index 88487bdef0e..bc08ffd2d42 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/entity/YamlPointcutConfiguration.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlPointcutConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.plugin.yaml.entity;
+package org.apache.shardingsphere.agent.core.plugin.yaml.entity;
import lombok.Getter;
import lombok.Setter;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/entity/YamlPointcutParameterConfiguration.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlPointcutParameterConfiguration.java
similarity index 93%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/entity/YamlPointcutParameterConfiguration.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlPointcutParameterConfiguration.java
index a086ca38a1d..39f128daa93 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/entity/YamlPointcutParameterConfiguration.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlPointcutParameterConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.plugin.yaml.entity;
+package org.apache.shardingsphere.agent.core.plugin.yaml.entity;
import lombok.Getter;
import lombok.Setter;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/loader/YamlAdvisorsConfigurationLoader.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/loader/YamlAdvisorsConfigurationLoader.java
similarity index 90%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/loader/YamlAdvisorsConfigurationLoader.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/loader/YamlAdvisorsConfigurationLoader.java
index eb4223705c8..8feb3d32433 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/loader/YamlAdvisorsConfigurationLoader.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/loader/YamlAdvisorsConfigurationLoader.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.plugin.yaml.loader;
+package org.apache.shardingsphere.agent.core.plugin.yaml.loader;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.agent.bootstrap.plugin.yaml.entity.YamlAdvisorsConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlAdvisorsConfiguration;
import org.yaml.snakeyaml.Yaml;
import java.io.InputStream;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/swapper/YamlAdvisorConfigurationSwapper.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorConfigurationSwapper.java
similarity index 84%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/swapper/YamlAdvisorConfigurationSwapper.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorConfigurationSwapper.java
index 7e8462c08b5..00a4e9acad2 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/swapper/YamlAdvisorConfigurationSwapper.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorConfigurationSwapper.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.plugin.yaml.swapper;
+package org.apache.shardingsphere.agent.core.plugin.yaml.swapper;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.config.advisor.MethodAdvisorConfiguration;
-import org.apache.shardingsphere.agent.bootstrap.plugin.advisor.AdvisorConfigurationRegistryFactory;
-import org.apache.shardingsphere.agent.bootstrap.plugin.yaml.entity.YamlAdvisorConfiguration;
-import org.apache.shardingsphere.agent.bootstrap.plugin.yaml.entity.YamlPointcutConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfigurationRegistryFactory;
+import org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlAdvisorConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlPointcutConfiguration;
/**
* YAML advisor configuration swapper.
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapper.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
similarity index 87%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
index 4fb82d2f02b..fa8136f0685 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.plugin.yaml.swapper;
+package org.apache.shardingsphere.agent.core.plugin.yaml.swapper;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
-import org.apache.shardingsphere.agent.bootstrap.plugin.yaml.entity.YamlAdvisorConfiguration;
-import org.apache.shardingsphere.agent.bootstrap.plugin.yaml.entity.YamlAdvisorsConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlAdvisorConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlAdvisorsConfiguration;
import java.util.Collection;
import java.util.LinkedList;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/swapper/YamlPointcutConfigurationSwapper.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlPointcutConfigurationSwapper.java
similarity index 90%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/swapper/YamlPointcutConfigurationSwapper.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlPointcutConfigurationSwapper.java
index e7e1eb7fefa..07731138c49 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/swapper/YamlPointcutConfigurationSwapper.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlPointcutConfigurationSwapper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.plugin.yaml.swapper;
+package org.apache.shardingsphere.agent.core.plugin.yaml.swapper;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@@ -23,8 +23,8 @@ import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.matcher.ElementMatcher;
import net.bytebuddy.matcher.ElementMatcher.Junction;
import net.bytebuddy.matcher.ElementMatchers;
-import org.apache.shardingsphere.agent.bootstrap.plugin.yaml.entity.YamlPointcutConfiguration;
-import org.apache.shardingsphere.agent.bootstrap.plugin.yaml.entity.YamlPointcutParameterConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlPointcutConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlPointcutParameterConfiguration;
import java.util.Optional;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/spi/AgentServiceLoader.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/spi/AgentServiceLoader.java
similarity index 97%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/spi/AgentServiceLoader.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/spi/AgentServiceLoader.java
index 9f712b4a25c..6d028090d27 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/spi/AgentServiceLoader.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/spi/AgentServiceLoader.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.spi;
+package org.apache.shardingsphere.agent.core.spi;
import com.google.common.base.Preconditions;
import lombok.Getter;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/spi/PluginBootServiceRegistry.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/spi/PluginBootServiceRegistry.java
similarity index 96%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/spi/PluginBootServiceRegistry.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/spi/PluginBootServiceRegistry.java
index 46ab5508c8d..2fbaa089b28 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/spi/PluginBootServiceRegistry.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/spi/PluginBootServiceRegistry.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.spi;
+package org.apache.shardingsphere.agent.core.spi;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/transformer/AgentJunction.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentJunction.java
similarity index 96%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/transformer/AgentJunction.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentJunction.java
index 4b9befe9908..8c5b0a620d8 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/transformer/AgentJunction.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentJunction.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.transformer;
+package org.apache.shardingsphere.agent.core.transformer;
import lombok.RequiredArgsConstructor;
import net.bytebuddy.description.type.TypeDescription;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/transformer/AgentTransformer.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformer.java
similarity index 87%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/transformer/AgentTransformer.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformer.java
index f50a579e1a2..1e0ae89dac8 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/transformer/AgentTransformer.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.transformer;
+package org.apache.shardingsphere.agent.core.transformer;
import lombok.RequiredArgsConstructor;
import net.bytebuddy.agent.builder.AgentBuilder.Transformer;
@@ -25,11 +25,11 @@ import net.bytebuddy.implementation.FieldAccessor;
import net.bytebuddy.jar.asm.Opcodes;
import net.bytebuddy.utility.JavaModule;
import org.apache.shardingsphere.agent.advice.TargetAdviceObject;
-import org.apache.shardingsphere.agent.bootstrap.classloader.ClassLoaderContext;
-import org.apache.shardingsphere.agent.bootstrap.plugin.PluginBootServiceManager;
-import org.apache.shardingsphere.agent.bootstrap.plugin.PluginJar;
-import org.apache.shardingsphere.agent.bootstrap.transformer.builder.MethodAdvisorBuilder;
-import org.apache.shardingsphere.agent.bootstrap.transformer.builder.advise.AdviceFactory;
+import org.apache.shardingsphere.agent.core.classloader.ClassLoaderContext;
+import org.apache.shardingsphere.agent.core.plugin.PluginBootServiceManager;
+import org.apache.shardingsphere.agent.core.plugin.PluginJar;
+import org.apache.shardingsphere.agent.core.transformer.builder.MethodAdvisorBuilder;
+import org.apache.shardingsphere.agent.core.transformer.builder.advise.AdviceFactory;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.config.plugin.PluginConfiguration;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/transformer/MethodAdvisor.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/MethodAdvisor.java
similarity index 88%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/transformer/MethodAdvisor.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/MethodAdvisor.java
index 9d8b2b511db..2879468daa7 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/transformer/MethodAdvisor.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/MethodAdvisor.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.transformer;
+package org.apache.shardingsphere.agent.core.transformer;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import net.bytebuddy.description.method.MethodDescription;
-import org.apache.shardingsphere.agent.bootstrap.plugin.executor.AdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.executor.AdviceExecutor;
/**
* Method advisor.
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/transformer/builder/MethodAdvisorBuilder.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/MethodAdvisorBuilder.java
similarity index 86%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/transformer/builder/MethodAdvisorBuilder.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/MethodAdvisorBuilder.java
index 38f68727b52..6ad9a6bbb63 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/transformer/builder/MethodAdvisorBuilder.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/MethodAdvisorBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.transformer.builder;
+package org.apache.shardingsphere.agent.core.transformer.builder;
import lombok.RequiredArgsConstructor;
import net.bytebuddy.description.method.MethodDescription.InDefinedShape;
@@ -25,14 +25,14 @@ import org.apache.shardingsphere.agent.advice.AgentAdvice;
import org.apache.shardingsphere.agent.advice.type.ConstructorAdvice;
import org.apache.shardingsphere.agent.advice.type.InstanceMethodAdvice;
import org.apache.shardingsphere.agent.advice.type.StaticMethodAdvice;
-import org.apache.shardingsphere.agent.bootstrap.logging.LoggerFactory;
-import org.apache.shardingsphere.agent.bootstrap.logging.LoggerFactory.Logger;
-import org.apache.shardingsphere.agent.bootstrap.plugin.executor.type.ConstructorAdviceExecutor;
-import org.apache.shardingsphere.agent.bootstrap.plugin.executor.type.InstanceMethodAdviceExecutor;
-import org.apache.shardingsphere.agent.bootstrap.plugin.executor.type.StaticMethodAdviceExecutor;
-import org.apache.shardingsphere.agent.bootstrap.transformer.MethodAdvisor;
+import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
+import org.apache.shardingsphere.agent.core.logging.LoggerFactory.Logger;
+import org.apache.shardingsphere.agent.core.plugin.executor.type.ConstructorAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.executor.type.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.executor.type.StaticMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.transformer.MethodAdvisor;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
-import org.apache.shardingsphere.agent.bootstrap.transformer.builder.advise.AdviceFactory;
+import org.apache.shardingsphere.agent.core.transformer.builder.advise.AdviceFactory;
import java.util.Collection;
import java.util.Optional;
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/transformer/builder/advise/AdviceFactory.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/advise/AdviceFactory.java
similarity index 92%
rename from agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/transformer/builder/advise/AdviceFactory.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/advise/AdviceFactory.java
index f5cdcbdc0cf..8ec861f8368 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/transformer/builder/advise/AdviceFactory.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/advise/AdviceFactory.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.transformer.builder.advise;
+package org.apache.shardingsphere.agent.core.transformer.builder.advise;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import org.apache.shardingsphere.agent.advice.AgentAdvice;
-import org.apache.shardingsphere.agent.bootstrap.classloader.ClassLoaderContext;
+import org.apache.shardingsphere.agent.core.classloader.ClassLoaderContext;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/config/loader/PluginConfigurationLoaderTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/config/loader/PluginConfigurationLoaderTest.java
similarity index 92%
rename from agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/config/loader/PluginConfigurationLoaderTest.java
rename to agent/core/src/test/java/org/apache/shardingsphere/agent/core/config/loader/PluginConfigurationLoaderTest.java
index 1e64dfadd6e..01780be94c2 100644
--- a/agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/config/loader/PluginConfigurationLoaderTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/config/loader/PluginConfigurationLoaderTest.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.config.loader;
+package org.apache.shardingsphere.agent.core.config.loader;
-import org.apache.shardingsphere.agent.bootstrap.path.AgentPathBuilder;
+import org.apache.shardingsphere.agent.core.path.AgentPathBuilder;
import org.junit.Test;
import org.mockito.internal.configuration.plugins.Plugins;
diff --git a/agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/plugin/advisor/AdvisorConfigurationRegistryFactoryTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryFactoryTest.java
similarity index 94%
rename from agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/plugin/advisor/AdvisorConfigurationRegistryFactoryTest.java
rename to agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryFactoryTest.java
index 7b57895296e..a45921d9ad0 100644
--- a/agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/plugin/advisor/AdvisorConfigurationRegistryFactoryTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryFactoryTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.plugin.advisor;
+package org.apache.shardingsphere.agent.core.plugin.advisor;
import org.junit.Test;
diff --git a/agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/plugin/advisor/AdvisorConfigurationRegistryTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryTest.java
similarity index 95%
rename from agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/plugin/advisor/AdvisorConfigurationRegistryTest.java
rename to agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryTest.java
index 8285fad320c..05471dc8b1b 100644
--- a/agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/plugin/advisor/AdvisorConfigurationRegistryTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.plugin.advisor;
+package org.apache.shardingsphere.agent.core.plugin.advisor;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.junit.Test;
diff --git a/agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/fixture/YamlAdviceFixture.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/fixture/YamlAdviceFixture.java
similarity index 96%
rename from agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/fixture/YamlAdviceFixture.java
rename to agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/fixture/YamlAdviceFixture.java
index 59a2961ad10..5cffd45cf32 100644
--- a/agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/fixture/YamlAdviceFixture.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/fixture/YamlAdviceFixture.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.plugin.yaml.fixture;
+package org.apache.shardingsphere.agent.core.plugin.yaml.fixture;
import org.apache.shardingsphere.agent.advice.TargetAdviceObject;
import org.apache.shardingsphere.agent.advice.type.ConstructorAdvice;
diff --git a/agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/fixture/YamlTargetObjectFixture.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/fixture/YamlTargetObjectFixture.java
similarity index 96%
rename from agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/fixture/YamlTargetObjectFixture.java
rename to agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/fixture/YamlTargetObjectFixture.java
index 69763f25d7f..3fa377432d1 100644
--- a/agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/fixture/YamlTargetObjectFixture.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/fixture/YamlTargetObjectFixture.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.plugin.yaml.fixture;
+package org.apache.shardingsphere.agent.core.plugin.yaml.fixture;
import lombok.NoArgsConstructor;
diff --git a/agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/loader/YamlAdvisorsConfigurationLoaderTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/loader/YamlAdvisorsConfigurationLoaderTest.java
similarity index 91%
rename from agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/loader/YamlAdvisorsConfigurationLoaderTest.java
rename to agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/loader/YamlAdvisorsConfigurationLoaderTest.java
index d50636c5ff9..9f3f4b315b4 100644
--- a/agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/loader/YamlAdvisorsConfigurationLoaderTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/loader/YamlAdvisorsConfigurationLoaderTest.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.plugin.yaml.loader;
+package org.apache.shardingsphere.agent.core.plugin.yaml.loader;
-import org.apache.shardingsphere.agent.bootstrap.plugin.yaml.entity.YamlAdvisorConfiguration;
-import org.apache.shardingsphere.agent.bootstrap.plugin.yaml.entity.YamlAdvisorsConfiguration;
-import org.apache.shardingsphere.agent.bootstrap.plugin.yaml.entity.YamlPointcutConfiguration;
-import org.apache.shardingsphere.agent.bootstrap.plugin.yaml.entity.YamlPointcutParameterConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlAdvisorConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlAdvisorsConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlPointcutConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlPointcutParameterConfiguration;
import org.junit.Test;
import java.util.ArrayList;
diff --git a/agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
similarity index 91%
rename from agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
rename to agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
index d4a054775a9..123e83c974c 100644
--- a/agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.plugin.yaml.swapper;
+package org.apache.shardingsphere.agent.core.plugin.yaml.swapper;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.config.advisor.MethodAdvisorConfiguration;
-import org.apache.shardingsphere.agent.bootstrap.plugin.yaml.entity.YamlAdvisorsConfiguration;
-import org.apache.shardingsphere.agent.bootstrap.plugin.yaml.fixture.YamlAdviceFixture;
-import org.apache.shardingsphere.agent.bootstrap.plugin.yaml.fixture.YamlTargetObjectFixture;
+import org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlAdvisorsConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.yaml.fixture.YamlAdviceFixture;
+import org.apache.shardingsphere.agent.core.plugin.yaml.fixture.YamlTargetObjectFixture;
import org.junit.Test;
import org.yaml.snakeyaml.Yaml;
diff --git a/agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/transformer/AgentTransformerTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformerTest.java
similarity index 93%
rename from agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/transformer/AgentTransformerTest.java
rename to agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformerTest.java
index 97817f4beaa..694073ba2a9 100644
--- a/agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/transformer/AgentTransformerTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.transformer;
+package org.apache.shardingsphere.agent.core.transformer;
import net.bytebuddy.ByteBuddy;
import net.bytebuddy.agent.ByteBuddyAgent;
@@ -25,11 +25,11 @@ import net.bytebuddy.dynamic.scaffold.TypeValidation;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.config.advisor.MethodAdvisorConfiguration;
-import org.apache.shardingsphere.agent.bootstrap.classloader.AgentClassLoader;
-import org.apache.shardingsphere.agent.bootstrap.logging.LoggingListener;
-import org.apache.shardingsphere.agent.bootstrap.transformer.fixture.advice.BarAdvice;
-import org.apache.shardingsphere.agent.bootstrap.transformer.fixture.advice.FooAdvice;
-import org.apache.shardingsphere.agent.bootstrap.transformer.fixture.targeted.TargetObjectFixture;
+import org.apache.shardingsphere.agent.core.classloader.AgentClassLoader;
+import org.apache.shardingsphere.agent.core.logging.LoggingListener;
+import org.apache.shardingsphere.agent.core.transformer.fixture.advice.BarAdvice;
+import org.apache.shardingsphere.agent.core.transformer.fixture.advice.FooAdvice;
+import org.apache.shardingsphere.agent.core.transformer.fixture.targeted.TargetObjectFixture;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/transformer/fixture/advice/BarAdvice.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/fixture/advice/BarAdvice.java
similarity index 97%
rename from agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/transformer/fixture/advice/BarAdvice.java
rename to agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/fixture/advice/BarAdvice.java
index a6e5a7246e9..90f08eeffa3 100644
--- a/agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/transformer/fixture/advice/BarAdvice.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/fixture/advice/BarAdvice.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.transformer.fixture.advice;
+package org.apache.shardingsphere.agent.core.transformer.fixture.advice;
import org.apache.shardingsphere.agent.advice.TargetAdviceObject;
import org.apache.shardingsphere.agent.advice.type.ConstructorAdvice;
diff --git a/agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/transformer/fixture/advice/FooAdvice.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/fixture/advice/FooAdvice.java
similarity index 97%
rename from agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/transformer/fixture/advice/FooAdvice.java
rename to agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/fixture/advice/FooAdvice.java
index 1cb51c23879..b80a7ea6b63 100644
--- a/agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/transformer/fixture/advice/FooAdvice.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/fixture/advice/FooAdvice.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.transformer.fixture.advice;
+package org.apache.shardingsphere.agent.core.transformer.fixture.advice;
import org.apache.shardingsphere.agent.advice.TargetAdviceObject;
import org.apache.shardingsphere.agent.advice.type.ConstructorAdvice;
diff --git a/agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/transformer/fixture/targeted/TargetObjectFixture.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/fixture/targeted/TargetObjectFixture.java
similarity index 95%
rename from agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/transformer/fixture/targeted/TargetObjectFixture.java
rename to agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/fixture/targeted/TargetObjectFixture.java
index ca0af3b5784..5352d448b2b 100644
--- a/agent/bootstrap/src/test/java/org/apache/shardingsphere/agent/bootstrap/transformer/fixture/targeted/TargetObjectFixture.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/fixture/targeted/TargetObjectFixture.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.bootstrap.transformer.fixture.targeted;
+package org.apache.shardingsphere.agent.core.transformer.fixture.targeted;
import java.util.List;
diff --git a/agent/bootstrap/src/test/resources/conf/advisors.yaml b/agent/core/src/test/resources/conf/advisors.yaml
similarity index 100%
rename from agent/bootstrap/src/test/resources/conf/advisors.yaml
rename to agent/core/src/test/resources/conf/advisors.yaml
diff --git a/agent/bootstrap/src/test/resources/conf/agent.yaml b/agent/core/src/test/resources/conf/agent.yaml
similarity index 100%
rename from agent/bootstrap/src/test/resources/conf/agent.yaml
rename to agent/core/src/test/resources/conf/agent.yaml
diff --git a/agent/bootstrap/src/test/resources/conf/empty-advisors.yaml b/agent/core/src/test/resources/conf/empty-advisors.yaml
similarity index 100%
rename from agent/bootstrap/src/test/resources/conf/empty-advisors.yaml
rename to agent/core/src/test/resources/conf/empty-advisors.yaml
diff --git a/agent/bootstrap/src/test/resources/logback-test.xml b/agent/core/src/test/resources/logback-test.xml
similarity index 100%
rename from agent/bootstrap/src/test/resources/logback-test.xml
rename to agent/core/src/test/resources/logback-test.xml
diff --git a/agent/distribution/pom.xml b/agent/distribution/pom.xml
index 6678ebe822f..328b0795c51 100644
--- a/agent/distribution/pom.xml
+++ b/agent/distribution/pom.xml
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-agent-bootstrap</artifactId>
+ <artifactId>shardingsphere-agent-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/agent/distribution/src/main/assembly/shardingsphere-agent-binary-distribution.xml b/agent/distribution/src/main/assembly/shardingsphere-agent-binary-distribution.xml
index 2810ba2c02d..e1cd1a7dfe5 100644
--- a/agent/distribution/src/main/assembly/shardingsphere-agent-binary-distribution.xml
+++ b/agent/distribution/src/main/assembly/shardingsphere-agent-binary-distribution.xml
@@ -77,7 +77,7 @@
<moduleSet>
<useAllReactorProjects>true</useAllReactorProjects>
<includes>
- <include>*:shardingsphere-agent-bootstrap</include>
+ <include>*:shardingsphere-agent-core</include>
</includes>
<binaries>
<unpack>false</unpack>
diff --git a/agent/pom.xml b/agent/pom.xml
index ddf0cf254c2..da8808c3a72 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -30,8 +30,9 @@
<modules>
<module>api</module>
- <module>bootstrap</module>
+ <module>core</module>
<module>plugins</module>
+
<module>distribution</module>
</modules>