fizzgate/fizz-gateway-node
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #390 from wehotel/feature/plugin

Browse Source 
remove deprecated util
This commit is contained in:
hongqiaowei
2021-12-09 11:59:05 +08:00
committed by GitHub
parent 0633eafc1f aa3780a895
commit 81d8388495
2 changed files with 3 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fizz-plugin/src/main/java/we/plugin/core/filter/AbstractFizzPlugin.java
View File

@@ -5,6 +5,7 @@ import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.ServerWebExchange;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import we.Fizz;
import we.plugin.FizzPluginFilter; import we.plugin.FizzPluginFilter;
import we.plugin.PluginConfig; import we.plugin.PluginConfig;
import we.plugin.auth.ApiConfig; 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.ContentParser;
import we.plugin.core.filter.config.FizzConfig; import we.plugin.core.filter.config.FizzConfig;
import we.plugin.core.filter.config.parser.JsonParser; import we.plugin.core.filter.config.parser.JsonParser;
import we.plugin.core.spring.util.FizzPluginAppContextUtils;
import we.util.WebUtils; import we.util.WebUtils;
import javax.annotation.Resource; import javax.annotation.Resource;
@@ -63,7 +63,7 @@ public abstract class AbstractFizzPlugin<RouterCfg, PluginCfg> implements FizzPl
.getActualTypeArguments()[0]; .getActualTypeArguments()[0];
FizzConfig fizzConfig = AnnotationUtils.findAnnotation(cfgClass, FizzConfig.class); FizzConfig fizzConfig = AnnotationUtils.findAnnotation(cfgClass, FizzConfig.class);
Class<? extends ContentParser> cfgParser = fizzConfig == null ? JsonParser.class : fizzConfig.contentParser(); Class<? extends ContentParser> 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); putAttr2exchange(exchange, nameExRtCfgParsed.apply(pluginName()), routerCfg);
return routerCfg; return routerCfg;
} }
@@ -83,7 +83,7 @@ public abstract class AbstractFizzPlugin<RouterCfg, PluginCfg> implements FizzPl
.getActualTypeArguments()[1]; .getActualTypeArguments()[1];
FizzConfig fizzConfig = AnnotationUtils.findAnnotation(cfgClass, FizzConfig.class); FizzConfig fizzConfig = AnnotationUtils.findAnnotation(cfgClass, FizzConfig.class);
Class<? extends ContentParser> cfgParser = fizzConfig == null ? JsonParser.class : fizzConfig.contentParser(); Class<? extends ContentParser> 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); putAttr2exchange(exchange, nameExPlCfgParsed.apply(pluginName()), pluginCfg);
return pluginCfg; return pluginCfg;
} }

34
fizz-plugin/src/main/java/we/plugin/core/spring/util/FizzPluginAppContextUtils.java
View File

@@ -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> T getBean(Class<T> 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;
}
}