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

update: rename class

Browse Source
This commit is contained in:
hongqiaowei
2021-01-15 18:15:03 +08:00
parent fafba8c45b
commit e0f3269b14
2 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/we/plugin/auth/GatewayGroup2appsToApiConfig.java → src/main/java/we/plugin/auth/GatewayGroup2apiConfig.java
View File

@@ -28,9 +28,9 @@ import java.util.Map;
* @author hongqiaowei * @author hongqiaowei
*/ */
public class GatewayGroup2appsToApiConfig { public class GatewayGroup2apiConfig {
private static final Logger log = LoggerFactory.getLogger(GatewayGroup2appsToApiConfig.class); private static final Logger log = LoggerFactory.getLogger(GatewayGroup2apiConfig.class);
private Map<String/*gg*/, Map<String/*a*/, ApiConfig>> configMap = new HashMap<>(6); private Map<String/*gg*/, Map<String/*a*/, ApiConfig>> configMap = new HashMap<>(6);

64
src/main/java/we/plugin/auth/ServiceConfig.java
View File

@@ -46,7 +46,7 @@ public class ServiceConfig {
@JsonIgnore @JsonIgnore
public Map<Integer, ApiConfig> apiConfigMap = new HashMap<>(32); public Map<Integer, ApiConfig> apiConfigMap = new HashMap<>(32);
public Map<String, EnumMap<HttpMethod, GatewayGroup2appsToApiConfig>> path2methodToApiConfigMapMap = new HashMap<>(6); public Map<String, EnumMap<HttpMethod, GatewayGroup2apiConfig>> path2methodToApiConfigMapMap = new HashMap<>(6);
public ServiceConfig(String id) { public ServiceConfig(String id) {
this.id = id; this.id = id;
@@ -54,36 +54,36 @@ public class ServiceConfig {
public void add(ApiConfig ac) { public void add(ApiConfig ac) {
apiConfigMap.put(ac.id, ac); apiConfigMap.put(ac.id, ac);
EnumMap<HttpMethod, GatewayGroup2appsToApiConfig> method2apiConfigMap = path2methodToApiConfigMapMap.get(ac.path); EnumMap<HttpMethod, GatewayGroup2apiConfig> method2apiConfigMap = path2methodToApiConfigMapMap.get(ac.path);
if (method2apiConfigMap == null) { if (method2apiConfigMap == null) {
method2apiConfigMap = new EnumMap<>(HttpMethod.class); method2apiConfigMap = new EnumMap<>(HttpMethod.class);
GatewayGroup2appsToApiConfig gatewayGroup2appsToApiConfig = new GatewayGroup2appsToApiConfig(); GatewayGroup2apiConfig gatewayGroup2apiConfig = new GatewayGroup2apiConfig();
gatewayGroup2appsToApiConfig.add(ac); gatewayGroup2apiConfig.add(ac);
method2apiConfigMap.put(ac.method, gatewayGroup2appsToApiConfig); method2apiConfigMap.put(ac.method, gatewayGroup2apiConfig);
path2methodToApiConfigMapMap.put(ac.path, method2apiConfigMap); path2methodToApiConfigMapMap.put(ac.path, method2apiConfigMap);
} else { } else {
GatewayGroup2appsToApiConfig gatewayGroup2appsToApiConfig = method2apiConfigMap.get(ac.method); GatewayGroup2apiConfig gatewayGroup2apiConfig = method2apiConfigMap.get(ac.method);
if (gatewayGroup2appsToApiConfig == null) { if (gatewayGroup2apiConfig == null) {
gatewayGroup2appsToApiConfig = new GatewayGroup2appsToApiConfig(); gatewayGroup2apiConfig = new GatewayGroup2apiConfig();
method2apiConfigMap.put(ac.method, gatewayGroup2appsToApiConfig); method2apiConfigMap.put(ac.method, gatewayGroup2apiConfig);
} }
gatewayGroup2appsToApiConfig.add(ac); gatewayGroup2apiConfig.add(ac);
} }
log.info("add " + ac); log.info("add " + ac);
} }
public void remove(ApiConfig ac) { public void remove(ApiConfig ac) {
ApiConfig remove = apiConfigMap.remove(ac.id); ApiConfig remove = apiConfigMap.remove(ac.id);
Map<HttpMethod, GatewayGroup2appsToApiConfig> method2apiConfigMap = path2methodToApiConfigMapMap.get(ac.path); Map<HttpMethod, GatewayGroup2apiConfig> method2apiConfigMap = path2methodToApiConfigMapMap.get(ac.path);
if (method2apiConfigMap == null) { if (method2apiConfigMap == null) {
log.info("no config to delete for " + ac.service + ' ' + ac.path); log.info("no config to delete for " + ac.service + ' ' + ac.path);
} else { } else {
GatewayGroup2appsToApiConfig gatewayGroup2appsToApiConfig = method2apiConfigMap.get(ac.method); GatewayGroup2apiConfig gatewayGroup2apiConfig = method2apiConfigMap.get(ac.method);
if (gatewayGroup2appsToApiConfig == null) { if (gatewayGroup2apiConfig == null) {
log.info("no config to delete for " + ac.service + ' ' + ac.method + ' ' + ac.path); log.info("no config to delete for " + ac.service + ' ' + ac.method + ' ' + ac.path);
} else { } else {
log.info(id + " remove " + ac); log.info(id + " remove " + ac);
gatewayGroup2appsToApiConfig.remove(ac); gatewayGroup2apiConfig.remove(ac);
} }
} }
} }
@@ -91,22 +91,22 @@ public class ServiceConfig {
public void update(ApiConfig ac) { public void update(ApiConfig ac) {
ApiConfig prev = apiConfigMap.put(ac.id, ac); ApiConfig prev = apiConfigMap.put(ac.id, ac);
log.info(prev + " is updated by " + ac + " in api config map"); log.info(prev + " is updated by " + ac + " in api config map");
EnumMap<HttpMethod, GatewayGroup2appsToApiConfig> method2apiConfigMap = path2methodToApiConfigMapMap.get(ac.path); EnumMap<HttpMethod, GatewayGroup2apiConfig> method2apiConfigMap = path2methodToApiConfigMapMap.get(ac.path);
if (method2apiConfigMap == null) { if (method2apiConfigMap == null) {
method2apiConfigMap = new EnumMap<>(HttpMethod.class); method2apiConfigMap = new EnumMap<>(HttpMethod.class);
GatewayGroup2appsToApiConfig gatewayGroup2appsToApiConfig = new GatewayGroup2appsToApiConfig(); GatewayGroup2apiConfig gatewayGroup2apiConfig = new GatewayGroup2apiConfig();
gatewayGroup2appsToApiConfig.add(ac); gatewayGroup2apiConfig.add(ac);
method2apiConfigMap.put(ac.method, gatewayGroup2appsToApiConfig); method2apiConfigMap.put(ac.method, gatewayGroup2apiConfig);
path2methodToApiConfigMapMap.put(ac.path, method2apiConfigMap); path2methodToApiConfigMapMap.put(ac.path, method2apiConfigMap);
} else { } else {
GatewayGroup2appsToApiConfig gatewayGroup2appsToApiConfig = method2apiConfigMap.get(ac.method); GatewayGroup2apiConfig gatewayGroup2apiConfig = method2apiConfigMap.get(ac.method);
if (gatewayGroup2appsToApiConfig == null) { if (gatewayGroup2apiConfig == null) {
gatewayGroup2appsToApiConfig = new GatewayGroup2appsToApiConfig(); gatewayGroup2apiConfig = new GatewayGroup2apiConfig();
method2apiConfigMap.put(ac.method, gatewayGroup2appsToApiConfig); method2apiConfigMap.put(ac.method, gatewayGroup2apiConfig);
gatewayGroup2appsToApiConfig.add(ac); gatewayGroup2apiConfig.add(ac);
} else { } else {
log.info(id + " update " + ac); log.info(id + " update " + ac);
gatewayGroup2appsToApiConfig.update(ac); gatewayGroup2apiConfig.update(ac);
} }
} }
} }
@@ -114,7 +114,7 @@ public class ServiceConfig {
@JsonIgnore @JsonIgnore
public ApiConfig getApiConfig(HttpMethod method, String path, String gatewayGroup, String app) { public ApiConfig getApiConfig(HttpMethod method, String path, String gatewayGroup, String app) {
// GatewayGroup2appsToApiConfig r = getApiConfig0(method, path); // GatewayGroup2appsToApiConfig r = getApiConfig0(method, path);
GatewayGroup2appsToApiConfig r = getApiConfig(method, path); GatewayGroup2apiConfig r = getApiConfig(method, path);
if (r == null) { if (r == null) {
return null; return null;
} }
@@ -124,19 +124,19 @@ public class ServiceConfig {
return r.get(gatewayGroup, app); return r.get(gatewayGroup, app);
} }
private GatewayGroup2appsToApiConfig getApiConfig(HttpMethod method, String reqPath) { private GatewayGroup2apiConfig getApiConfig(HttpMethod method, String reqPath) {
List<String> matchPathPatterns = ThreadContext.getArrayList(mpps, String.class); List<String> matchPathPatterns = ThreadContext.getArrayList(mpps, String.class);
Set<Map.Entry<String, EnumMap<HttpMethod, GatewayGroup2appsToApiConfig>>> es = path2methodToApiConfigMapMap.entrySet(); Set<Map.Entry<String, EnumMap<HttpMethod, GatewayGroup2apiConfig>>> es = path2methodToApiConfigMapMap.entrySet();
for (Map.Entry<String, EnumMap<HttpMethod, GatewayGroup2appsToApiConfig>> e : es) { for (Map.Entry<String, EnumMap<HttpMethod, GatewayGroup2apiConfig>> e : es) {
String pathPattern = e.getKey(); String pathPattern = e.getKey();
if (ApiConfig.isAntPathPattern(pathPattern)) { if (ApiConfig.isAntPathPattern(pathPattern)) {
if (antPathMatcher.match(pathPattern, reqPath)) { if (antPathMatcher.match(pathPattern, reqPath)) {
matchPathPatterns.add(pathPattern); matchPathPatterns.add(pathPattern);
} }
} else if (reqPath.equals(pathPattern)) { } else if (reqPath.equals(pathPattern)) {
return getGatewayGroup2appsToApiConfig(method, e.getValue()); return getGatewayGroup2apiConfig(method, e.getValue());
} }
} }
if (matchPathPatterns.isEmpty()) { if (matchPathPatterns.isEmpty()) {
@@ -149,7 +149,7 @@ public class ServiceConfig {
"\nmatch patterns: " + matchPathPatterns + "\nmatch patterns: " + matchPathPatterns +
"\nbest one: " + bestPattern); "\nbest one: " + bestPattern);
} }
return getGatewayGroup2appsToApiConfig(method, path2methodToApiConfigMapMap.get(bestPattern)); return getGatewayGroup2apiConfig(method, path2methodToApiConfigMapMap.get(bestPattern));
} }
} }
@@ -174,8 +174,8 @@ public class ServiceConfig {
// } // }
// } // }
private GatewayGroup2appsToApiConfig getGatewayGroup2appsToApiConfig(HttpMethod method, EnumMap<HttpMethod, GatewayGroup2appsToApiConfig> method2apiConfigMap) { private GatewayGroup2apiConfig getGatewayGroup2apiConfig(HttpMethod method, EnumMap<HttpMethod, GatewayGroup2apiConfig> method2apiConfigMap) {
GatewayGroup2appsToApiConfig r = method2apiConfigMap.get(method); GatewayGroup2apiConfig r = method2apiConfigMap.get(method);
if (r == null) { if (r == null) {
return method2apiConfigMap.get(HttpMethod.X); return method2apiConfigMap.get(HttpMethod.X);
} else { } else {