remove deprecated util
This commit is contained in:
@@ -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<RouterCfg, PluginCfg> implements FizzPl
|
||||
.getActualTypeArguments()[0];
|
||||
FizzConfig fizzConfig = AnnotationUtils.findAnnotation(cfgClass, FizzConfig.class);
|
||||
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);
|
||||
return routerCfg;
|
||||
}
|
||||
@@ -83,7 +83,7 @@ public abstract class AbstractFizzPlugin<RouterCfg, PluginCfg> implements FizzPl
|
||||
.getActualTypeArguments()[1];
|
||||
FizzConfig fizzConfig = AnnotationUtils.findAnnotation(cfgClass, FizzConfig.class);
|
||||
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);
|
||||
return pluginCfg;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user