/*
 * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
 *
 * WSO2 Inc. licenses this file to you 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
 *
 *    http://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 org.wso2.carbon.apimgt.keymgt.listeners;

import org.apache.axis2.context.ConfigurationContext;
import org.wso2.carbon.apimgt.impl.utils.APIUtil;
import org.wso2.carbon.apimgt.keymgt.SubscriptionDataHolder;
import org.wso2.carbon.base.MultitenantConstants;
import org.wso2.carbon.core.ServerStartupObserver;
import org.wso2.carbon.utils.AbstractAxis2ConfigurationContextObserver;
import org.wso2.carbon.utils.multitenancy.MultitenantUtils;

public class ServerStartupListener extends AbstractAxis2ConfigurationContextObserver implements ServerStartupObserver {

    @Override
    public void completingServerStartup() {

    }

    @Override
    public void completedServerStartup() {
        //load subscription data to memory
        SubscriptionDataHolder.getInstance().registerTenantSubscriptionStore(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
    }

    @Override
    public void createdConfigurationContext(ConfigurationContext configContext) {
        //load subscription data to memory
        int tenantId = MultitenantUtils.getTenantId(configContext);
        String tenantDomain = APIUtil.getTenantDomainFromTenantId(tenantId);
        SubscriptionDataHolder.getInstance().registerTenantSubscriptionStore(tenantDomain);
    }

    @Override
    public void terminatedConfigurationContext(ConfigurationContext configCtx) {

        int tenantId = MultitenantUtils.getTenantId(configCtx);
        SubscriptionDataHolder.getInstance().unregisterTenantSubscriptionStore(tenantId);
    }
}

@@ -2078,16 +2078,93 @@
 igCtx);%0A
+        String tenantDomain = APIUtil.getTenantDomainFromTenantId(tenantId);%0A
         
@@ -2236,25 +2236,29 @@
 Store(tenant
-Id
+Domain
 );%0A    %7D%0A%7D%0A

fix tenantId