This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 39cee8ae62d Refactor YamlAdvisorsConfigurationSwapper (#23429)
39cee8ae62d is described below
commit 39cee8ae62d64309487d7563cde136f59342ad98
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Jan 9 14:33:21 2023 +0800
Refactor YamlAdvisorsConfigurationSwapper (#23429)
* Refactor YamlPointcutConfigurationSwapper
* Refactor YamlAdvisorConfigurationSwapper
* Refactor YamlAdvisorsConfigurationSwapper
---
.../advisor/config/AdvisorConfigurationLoader.java | 2 +-
.../swapper/YamlAdvisorConfigurationSwapper.java | 10 +++++-----
.../swapper/YamlAdvisorsConfigurationSwapper.java | 6 +++---
.../swapper/YamlPointcutConfigurationSwapper.java | 20 ++++++++++----------
.../YamlAdvisorsConfigurationSwapperTest.java | 2 +-
5 files changed, 20 insertions(+), 20 deletions(-)
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfigurationLoader.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfigurationLoader.java
index 9c78f4ad7b3..05f62b7219e 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfigurationLoader.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfigurationLoader.java
@@ -56,7 +56,7 @@ public final class AdvisorConfigurationLoader {
if (null == advisorsResourceStream) {
LOGGER.info("No configuration of advisor for type `{}`.",
each);
} else {
- mergeConfigurations(result,
YamlAdvisorsConfigurationSwapper.swapToObject(YamlAdvisorsConfigurationLoader.load(advisorsResourceStream),
each));
+ mergeConfigurations(result,
YamlAdvisorsConfigurationSwapper.swap(YamlAdvisorsConfigurationLoader.load(advisorsResourceStream),
each));
}
}
return result;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlAdvisorConfigurationSwapper.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlAdvisorConfigurationSwapper.java
index a9e6334444d..496083d8467 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlAdvisorConfigurationSwapper.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlAdvisorConfigurationSwapper.java
@@ -34,14 +34,14 @@ public final class YamlAdvisorConfigurationSwapper {
/**
* Swap from YAML advisor configuration to advisors configuration.
*
- * @param yamlAdvisorConfig YAML advisor configuration
+ * @param yamlConfig YAML advisor configuration
* @param type type
* @return advisor configuration
*/
- public static AdvisorConfiguration swapToObject(final
YamlAdvisorConfiguration yamlAdvisorConfig, final String type) {
- AdvisorConfiguration result =
AdvisorConfigurationRegistryFactory.getRegistry(type).getAdvisorConfiguration(yamlAdvisorConfig.getTarget());
- for (YamlPointcutConfiguration each :
yamlAdvisorConfig.getPointcuts()) {
-
YamlPointcutConfigurationSwapper.swapToObject(each).ifPresent(elementMatcher ->
result.getAdvisors().add(new MethodAdvisorConfiguration(elementMatcher,
yamlAdvisorConfig.getAdvice())));
+ public static AdvisorConfiguration swap(final YamlAdvisorConfiguration
yamlConfig, final String type) {
+ AdvisorConfiguration result =
AdvisorConfigurationRegistryFactory.getRegistry(type).getAdvisorConfiguration(yamlConfig.getTarget());
+ for (YamlPointcutConfiguration each : yamlConfig.getPointcuts()) {
+
YamlPointcutConfigurationSwapper.swap(each).ifPresent(elementMatcher ->
result.getAdvisors().add(new MethodAdvisorConfiguration(elementMatcher,
yamlConfig.getAdvice())));
}
return result;
}
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
index 860a2be7190..393864cedcc 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
@@ -36,14 +36,14 @@ public final class YamlAdvisorsConfigurationSwapper {
* Swap from YAML advisors configuration to advisor configurations.
*
* @param yamlAdvisorsConfig YAML advisors configuration
- * @param type type
+ * @param type plugin type
* @return advisor configurations
*/
- public static Collection<AdvisorConfiguration> swapToObject(final
YamlAdvisorsConfiguration yamlAdvisorsConfig, final String type) {
+ public static Collection<AdvisorConfiguration> swap(final
YamlAdvisorsConfiguration yamlAdvisorsConfig, final String type) {
Collection<AdvisorConfiguration> result = new LinkedList<>();
for (YamlAdvisorConfiguration each : yamlAdvisorsConfig.getAdvisors())
{
if (null != each.getTarget()) {
- result.add(YamlAdvisorConfigurationSwapper.swapToObject(each,
type));
+ result.add(YamlAdvisorConfigurationSwapper.swap(each, type));
}
}
return result;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlPointcutConfigurationSwapper.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlPointcutConfigurationSwapper.java
index c8bdb0d09d1..8192c0b048d 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlPointcutConfigurationSwapper.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlPointcutConfigurationSwapper.java
@@ -35,24 +35,24 @@ import java.util.Optional;
public final class YamlPointcutConfigurationSwapper {
/**
- * Swap from YAML pointcut configuration to advisors configuration.
+ * Swap from YAML pointcut configuration to method pointcut.
*
- * @param yamlPointcutConfig YAML pointcut configuration
- * @return pointcut
+ * @param yamlConfig YAML pointcut configuration
+ * @return method pointcut
*/
- public static Optional<ElementMatcher<? super MethodDescription>>
swapToObject(final YamlPointcutConfiguration yamlPointcutConfig) {
- if ("constructor".equals(yamlPointcutConfig.getType())) {
- return Optional.of(appendParameters(yamlPointcutConfig,
ElementMatchers.isConstructor()));
+ public static Optional<ElementMatcher<? super MethodDescription>>
swap(final YamlPointcutConfiguration yamlConfig) {
+ if ("constructor".equals(yamlConfig.getType())) {
+ return Optional.of(appendParameters(yamlConfig,
ElementMatchers.isConstructor()));
}
- if ("method".equals(yamlPointcutConfig.getType())) {
- return Optional.of(appendParameters(yamlPointcutConfig,
ElementMatchers.named(yamlPointcutConfig.getName())));
+ if ("method".equals(yamlConfig.getType())) {
+ return Optional.of(appendParameters(yamlConfig,
ElementMatchers.named(yamlConfig.getName())));
}
return Optional.empty();
}
- private static ElementMatcher<? super MethodDescription>
appendParameters(final YamlPointcutConfiguration yamlPointcutConfig, final
Junction<? super MethodDescription> pointcut) {
+ private static ElementMatcher<? super MethodDescription>
appendParameters(final YamlPointcutConfiguration yamlConfig, final Junction<?
super MethodDescription> pointcut) {
Junction<? super MethodDescription> result = pointcut;
- for (YamlPointcutParameterConfiguration each :
yamlPointcutConfig.getParams()) {
+ for (YamlPointcutParameterConfiguration each : yamlConfig.getParams())
{
result = result.and(ElementMatchers.takesArgument(each.getIndex(),
ElementMatchers.named(each.getType())));
}
return result;
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
index 98bc121aa3e..1fa63102372 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
@@ -37,7 +37,7 @@ public final class YamlAdvisorsConfigurationSwapperTest {
@Test
public void assertSwapToObject() {
- Collection<AdvisorConfiguration> actual =
YamlAdvisorsConfigurationSwapper.swapToObject(
+ Collection<AdvisorConfiguration> actual =
YamlAdvisorsConfigurationSwapper.swap(
new
Yaml().loadAs(getClass().getResourceAsStream("/META-INF/conf/advisors.yaml"),
YamlAdvisorsConfiguration.class), "YAML_FIXTURE");
assertThat(actual.size(), is(1));
assertAdvisorConfiguration(actual.iterator().next());
