diff --git a/fizz-plugin/src/main/java/we/plugin/core/filter/AbstractFizzPlugin.java b/fizz-plugin/src/main/java/we/plugin/core/filter/AbstractFizzPlugin.java index 851fc4f..80fb5b5 100644 --- a/fizz-plugin/src/main/java/we/plugin/core/filter/AbstractFizzPlugin.java +++ b/fizz-plugin/src/main/java/we/plugin/core/filter/AbstractFizzPlugin.java @@ -5,6 +5,7 @@ import org.springframework.core.annotation.AnnotationUtils; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.web.server.ServerWebExchange; import reactor.core.publisher.Mono; +import we.Fizz; import we.plugin.FizzPluginFilter; import we.plugin.PluginConfig; import we.plugin.auth.ApiConfig; @@ -12,7 +13,6 @@ import we.plugin.auth.ApiConfigService; import we.plugin.core.filter.config.ContentParser; import we.plugin.core.filter.config.FizzConfig; import we.plugin.core.filter.config.parser.JsonParser; -import we.plugin.core.spring.util.FizzPluginAppContextUtils; import we.util.WebUtils; import javax.annotation.Resource; @@ -63,7 +63,7 @@ public abstract class AbstractFizzPlugin implements FizzPl .getActualTypeArguments()[0]; FizzConfig fizzConfig = AnnotationUtils.findAnnotation(cfgClass, FizzConfig.class); Class cfgParser = fizzConfig == null ? JsonParser.class : fizzConfig.contentParser(); - RouterCfg routerCfg = FizzPluginAppContextUtils.getBean(cfgParser).parseRouterCfg(originRouterCfg(exchange), cfgClass); + RouterCfg routerCfg = Fizz.context.getBean(cfgParser).parseRouterCfg(originRouterCfg(exchange), cfgClass); putAttr2exchange(exchange, nameExRtCfgParsed.apply(pluginName()), routerCfg); return routerCfg; } @@ -83,7 +83,7 @@ public abstract class AbstractFizzPlugin implements FizzPl .getActualTypeArguments()[1]; FizzConfig fizzConfig = AnnotationUtils.findAnnotation(cfgClass, FizzConfig.class); Class cfgParser = fizzConfig == null ? JsonParser.class : fizzConfig.contentParser(); - PluginCfg pluginCfg = FizzPluginAppContextUtils.getBean(cfgParser).parsePluginCfg(originPluginCfg(exchange), cfgClass); + PluginCfg pluginCfg = Fizz.context.getBean(cfgParser).parsePluginCfg(originPluginCfg(exchange), cfgClass); putAttr2exchange(exchange, nameExPlCfgParsed.apply(pluginName()), pluginCfg); return pluginCfg; } diff --git a/fizz-plugin/src/main/java/we/plugin/core/spring/util/FizzPluginAppContextUtils.java b/fizz-plugin/src/main/java/we/plugin/core/spring/util/FizzPluginAppContextUtils.java deleted file mode 100644 index 92e1084..0000000 --- a/fizz-plugin/src/main/java/we/plugin/core/spring/util/FizzPluginAppContextUtils.java +++ /dev/null @@ -1,34 +0,0 @@ -package we.plugin.core.spring.util; - -import org.springframework.beans.BeansException; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; -import org.springframework.stereotype.Component; - -/** - * @author huanghua - * @deprecated and use {@link we.Fizz} instead - */ -@Component -public class FizzPluginAppContextUtils implements ApplicationContextAware { - private static ApplicationContext applicationContext; - - @Override - public void setApplicationContext(ApplicationContext appContext) throws BeansException { - applicationContext = appContext; - } - - public static T getBean(Class requiredType) throws BeansException { - return FizzPluginAppContextUtils.getApplicationContext().getBean(requiredType); - } - - public static ApplicationContext getApplicationContext() { - if (applicationContext == null) { - String msg = "The applicationContext is not yet available. " - + "Please ensure that the spring applicationContext is completely created before calling this method!"; - throw new IllegalStateException(msg); - } - - return applicationContext; - } -}