/*
 * Copyright 1999-2019 Alibaba Group Holding Ltd.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package com.alibaba.csp.sentinel.adapter.gateway.sc.api;

import java.util.Collections;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;

import com.alibaba.csp.sentinel.adapter.gateway.common.api.ApiDefinition;
import com.alibaba.csp.sentinel.adapter.gateway.sc.api.matcher.WebExchangeApiMatcher;

/**
 * @author Eric Zhao
 * @since 1.6.0
 */
public final class GatewayApiMatcherManager {

    private static final Map<String, WebExchangeApiMatcher> API_MATCHER_MAP = new ConcurrentHashMap<>();

    public static Map<String, WebExchangeApiMatcher> getApiMatcherMap() {
        return Collections.unmodifiableMap(API_MATCHER_MAP);
    }

    public static Optional<WebExchangeApiMatcher> getMatcher(final String apiName) {
        return Optional.ofNullable(apiName)
            .map(e -> API_MATCHER_MAP.get(apiName));
    }

    public static Set<ApiDefinition> getApiDefinitionSet() {
        return API_MATCHER_MAP.values()
            .stream()
            .map(WebExchangeApiMatcher::getApiDefinition)
            .collect(Collectors.toSet());
    }

    static synchronized void loadApiDefinitions(/*@Valid*/ Set<ApiDefinition> definitions) {
        if (definitions == null || definitions.isEmpty()) {
            API_MATCHER_MAP.clear();
            return;
        }
        definitions.forEach(GatewayApiMatcherManager::addApiDefinition);
    }

    static void addApiDefinition(ApiDefinition definition) {
        API_MATCHER_MAP.put(definition.getApiName(), new WebExchangeApiMatcher(definition));
    }

    private GatewayApiMatcherManager() {}
}

@@ -679,29 +679,73 @@
 ort 
-java.util.Collec
+com.alibaba.csp.sentinel.adapter.gateway.common.api.ApiDefini
 tion
-s
 ;%0Aim
@@ -753,22 +753,87 @@
 ort 
-java.util.Map;
+com.alibaba.csp.sentinel.adapter.gateway.sc.api.matcher.WebExchangeApiMatcher;%0A
 %0Aimp
@@ -846,24 +846,27 @@
 va.util.
-Op
+Collec
 tion
-al
+s
 ;%0Aimport
@@ -876,19 +876,23 @@
 va.util.
-Set
+HashMap
 ;%0Aimport
@@ -906,233 +906,96 @@
 til.
-concurrent.ConcurrentHashMap;%0Aimport java.util.stream.Collectors;%0A%0Aimport com.alibaba.csp.sentinel.adapter.gateway.common.api.ApiDefinition;%0Aimport com.alibaba.csp.sentinel.adapter.gateway.sc.api.matcher.WebExchangeApiMatcher
+Map;%0Aimport java.util.Optional;%0Aimport java.util.Set;%0Aimport java.util.stream.Collectors
 ;%0A%0A/
@@ -1104,21 +1104,24 @@
  static 
-final
+volatile
  Map%3CStr
@@ -1174,18 +1174,8 @@
 new 
-Concurrent
 Hash
@@ -1850,226 +1850,89 @@
     
-if (definitions == null %7C%7C definitions.isEmpty()) %7B%0A            API_MATCHER_MAP.clear();%0A            return;%0A        %7D%0A        definitions.forEach(GatewayApiMatcherManager::addApiDefinition
+Map%3CString, WebExchangeApiMatcher%3E apiMatcherMap = new HashMap%3C%3E(
 );%0A    
-%7D%0A%0A
     
-static void add
+for (
 ApiD
@@ -1940,21 +1940,18 @@
 finition
-(ApiD
+ d
 efinitio
@@ -1943,32 +1943,34 @@
 ition definition
+ :
  definition) %7B%0A 
@@ -1964,16 +1964,17 @@
 finition
+s
 ) %7B%0A    
@@ -1977,31 +1977,33 @@
         
+ 
-API_MATCHER_MAP
+   apiMatcherMap
 .put(def
@@ -2060,24 +2060,76 @@
 finition));%0A
+        %7D%0A%0A        API_MATCHER_MAP = apiMatcherMap;%0A
     %7D%0A%0A    p

Fix the bug that legacy API matchers in ScGatewayApiMatcherManager were not removed (#2436)