[shardingsphere] branch master updated: For agent-core code format (#23434)

[panjuan]

This is an automated email from the ASF dual-hosted git repository.

panjuan 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 321d3145cd8 For agent-core code format (#23434)
321d3145cd8 is described below

commit 321d3145cd83dbb88cf0d6ee0aeaadf9c6686ab8
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Mon Jan 9 16:49:18 2023 +0800

    For agent-core code format (#23434)
---
 .../core/advisor/config/AdvisorConfigurationLoader.java   |  4 ++--
 .../yaml/swapper/YamlAdvisorConfigurationSwapper.java     |  2 +-
 .../yaml/swapper/YamlAdvisorsConfigurationSwapper.java    | 15 ++++-----------
 3 files changed, 7 insertions(+), 14 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 c17ff11cbd4..58d48c5adeb 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
@@ -79,8 +79,8 @@ public final class AdvisorConfigurationLoader {
         return String.join("-", pluginType.toLowerCase(), "advisors.yaml");
     }
     
-    private static void mergeConfigurations(final Map<String, 
AdvisorConfiguration> advisorConfigMap, final Collection<AdvisorConfiguration> 
advisorConfigs) {
-        for (AdvisorConfiguration each : advisorConfigs) {
+    private static void mergeConfigurations(final Map<String, 
AdvisorConfiguration> advisorConfigMap, final Collection<AdvisorConfiguration> 
toBeMergedAdvisorConfigs) {
+        for (AdvisorConfiguration each : toBeMergedAdvisorConfigs) {
             advisorConfigMap.computeIfAbsent(each.getTargetClassName(), key -> 
new 
AdvisorConfiguration(each.getTargetClassName())).getAdvisors().addAll(each.getAdvisors());
         }
     }
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 7465ca8d389..412ed00495b 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
@@ -39,7 +39,7 @@ public final class YamlAdvisorConfigurationSwapper {
     public static AdvisorConfiguration swap(final YamlAdvisorConfiguration 
yamlConfig) {
         AdvisorConfiguration result = new 
AdvisorConfiguration(yamlConfig.getTarget());
         for (YamlPointcutConfiguration each : yamlConfig.getPointcuts()) {
-            
YamlPointcutConfigurationSwapper.swap(each).ifPresent(elementMatcher -> 
result.getAdvisors().add(new MethodAdvisorConfiguration(elementMatcher, 
yamlConfig.getAdvice())));
+            YamlPointcutConfigurationSwapper.swap(each).ifPresent(optional -> 
result.getAdvisors().add(new MethodAdvisorConfiguration(optional, 
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 0ac766fd0db..757f3e29b6a 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
@@ -20,11 +20,10 @@ package 
org.apache.shardingsphere.agent.core.advisor.config.yaml.swapper;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import 
org.apache.shardingsphere.agent.core.advisor.config.AdvisorConfiguration;
-import 
org.apache.shardingsphere.agent.core.advisor.config.yaml.entity.YamlAdvisorConfiguration;
 import 
org.apache.shardingsphere.agent.core.advisor.config.yaml.entity.YamlAdvisorsConfiguration;
 
 import java.util.Collection;
-import java.util.LinkedList;
+import java.util.stream.Collectors;
 
 /**
  * YAML advisors configuration swapper.
@@ -35,16 +34,10 @@ public final class YamlAdvisorsConfigurationSwapper {
     /**
      * Swap from YAML advisors configuration to advisor configurations.
      * 
-     * @param yamlAdvisorsConfig YAML advisors configuration
+     * @param yamlConfig YAML advisors configuration
      * @return advisor configurations
      */
-    public static Collection<AdvisorConfiguration> swap(final 
YamlAdvisorsConfiguration yamlAdvisorsConfig) {
-        Collection<AdvisorConfiguration> result = new LinkedList<>();
-        for (YamlAdvisorConfiguration each : yamlAdvisorsConfig.getAdvisors()) 
{
-            if (null != each.getTarget()) {
-                result.add(YamlAdvisorConfigurationSwapper.swap(each));
-            }
-        }
-        return result;
+    public static Collection<AdvisorConfiguration> swap(final 
YamlAdvisorsConfiguration yamlConfig) {
+        return yamlConfig.getAdvisors().stream().filter(each -> null != 
each.getTarget()).map(YamlAdvisorConfigurationSwapper::swap).collect(Collectors.toList());
     }
 }