From 17a9a8d75aef6ed39a0a1c7aa4b7d547f5d3d40e Mon Sep 17 00:00:00 2001 From: Haotian Zhang <928016560@qq.com> Date: Mon, 6 Mar 2023 16:11:47 +0800 Subject: [PATCH] fix:fix NPE. --- .../feign/DefaultEnhancedFeignPluginRunner.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/feign/DefaultEnhancedFeignPluginRunner.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/feign/DefaultEnhancedFeignPluginRunner.java index affce002..dbaf7d58 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/feign/DefaultEnhancedFeignPluginRunner.java +++ b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/feign/DefaultEnhancedFeignPluginRunner.java @@ -18,12 +18,11 @@ package com.tencent.cloud.rpc.enhancement.feign; -import java.util.ArrayList; import java.util.Comparator; -import java.util.HashMap; import java.util.List; -import java.util.Map; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Multimap; import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignContext; import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignPlugin; import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignPluginType; @@ -37,18 +36,13 @@ import org.springframework.util.CollectionUtils; */ public class DefaultEnhancedFeignPluginRunner implements EnhancedFeignPluginRunner { - private Map> pluginMap = new HashMap<>(); + private final Multimap pluginMap = ArrayListMultimap.create(); public DefaultEnhancedFeignPluginRunner(List enhancedFeignPlugins) { if (!CollectionUtils.isEmpty(enhancedFeignPlugins)) { enhancedFeignPlugins.stream() .sorted(Comparator.comparing(EnhancedFeignPlugin::getOrder)) - .forEach(plugin -> { - if (!pluginMap.containsKey(plugin.getType().name())) { - pluginMap.put(plugin.getType().name(), new ArrayList<>()); - } - pluginMap.get(plugin.getType().name()).add(plugin); - }); + .forEach(plugin -> pluginMap.put(plugin.getType().name(), plugin)); } }