[incubator-shenyu] branch master updated: code polish (#1754)

[dengliming]

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

dengliming pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git


The following commit(s) were added to refs/heads/master by this push:
     new 970be6d  code polish (#1754)
970be6d is described below

commit 970be6d92732bc081f97685b3c39fe9c57f830d0
Author: YuDong Tang <583125...@qq.com>
AuthorDate: Tue Jul 13 10:32:06 2021 +0800

    code polish (#1754)
    
    * add motan demo.
    
    * code polish.
---
 .../modify/response/ModifyResponsePlugin.java      | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git 
a/shenyu-plugin/shenyu-plugin-modify-response/src/main/java/org/apache/shenyu/plugin/modify/response/ModifyResponsePlugin.java
 
b/shenyu-plugin/shenyu-plugin-modify-response/src/main/java/org/apache/shenyu/plugin/modify/response/ModifyResponsePlugin.java
index 2ba70e2..a337566 100644
--- 
a/shenyu-plugin/shenyu-plugin-modify-response/src/main/java/org/apache/shenyu/plugin/modify/response/ModifyResponsePlugin.java
+++ 
b/shenyu-plugin/shenyu-plugin-modify-response/src/main/java/org/apache/shenyu/plugin/modify/response/ModifyResponsePlugin.java
@@ -78,27 +78,27 @@ public class ModifyResponsePlugin extends 
AbstractShenyuPlugin {
         if (Objects.nonNull(modifyResponseRuleHandle)) {
             ServerHttpResponse response = exchange.getResponse();
             HttpHeaders httpHeaders = response.getHeaders();
-            if (Objects.nonNull(modifyResponseRuleHandle.getAddHeaders()) && 
MapUtils.isNotEmpty(modifyResponseRuleHandle.getAddHeaders())) {
+            if (MapUtils.isNotEmpty(modifyResponseRuleHandle.getAddHeaders())) 
{
                 Map<String, String> addHeaderMap = 
modifyResponseRuleHandle.getAddHeaders();
-                addHeaderMap.entrySet().stream().forEach(a -> 
httpHeaders.add(a.getKey(), a.getValue()));
+                addHeaderMap.forEach(httpHeaders::add);
             }
 
-            if (Objects.nonNull(modifyResponseRuleHandle.getSetHeaders()) && 
MapUtils.isNotEmpty(modifyResponseRuleHandle.getSetHeaders())) {
+            if (MapUtils.isNotEmpty(modifyResponseRuleHandle.getSetHeaders())) 
{
                 Map<String, String> setHeaderMap = 
modifyResponseRuleHandle.getSetHeaders();
-                setHeaderMap.entrySet().stream().forEach(a -> 
httpHeaders.set(a.getKey(), a.getValue()));
+                setHeaderMap.forEach(httpHeaders::set);
             }
 
-            if 
(Objects.nonNull(modifyResponseRuleHandle.getReplaceHeaderKeys()) && 
MapUtils.isNotEmpty(modifyResponseRuleHandle.getReplaceHeaderKeys())) {
+            if 
(MapUtils.isNotEmpty(modifyResponseRuleHandle.getReplaceHeaderKeys())) {
                 Map<String, String> replaceHeaderMap = 
modifyResponseRuleHandle.getReplaceHeaderKeys();
-                replaceHeaderMap.entrySet().stream().forEach(a -> {
-                    httpHeaders.addAll(a.getValue(), 
httpHeaders.get(a.getKey()));
-                    httpHeaders.remove(a.getKey());
+                replaceHeaderMap.forEach((key, value) -> {
+                    httpHeaders.addAll(value, httpHeaders.get(key));
+                    httpHeaders.remove(key);
                 });
             }
 
             if 
(Objects.nonNull(modifyResponseRuleHandle.getRemoveHeaderKeys()) && 
!CollectionUtils.isEmpty(modifyResponseRuleHandle.getRemoveHeaderKeys())) {
                 Set<String> removeHeaderList = 
modifyResponseRuleHandle.getRemoveHeaderKeys();
-                removeHeaderList.stream().forEach(a -> httpHeaders.remove(a));
+                removeHeaderList.forEach(httpHeaders::remove);
             }
 
             if (modifyResponseRuleHandle.getStatusCode() > 0) {
@@ -181,9 +181,7 @@ public class ModifyResponsePlugin extends 
AbstractShenyuPlugin {
                 });
             }
             if (!CollectionUtils.isEmpty(handle.getRemoveBodyKeys())) {
-                handle.getRemoveBodyKeys().forEach(info -> {
-                    context.delete(info);
-                });
+                handle.getRemoveBodyKeys().forEach(context::delete);
             }
             return context.jsonString();
         }