Fix external gateway check

Author: msm1992

components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIAdminImpl.java

@@ -200,12 +200,6 @@ public Environment addEnvironment(String tenantDomain, Environment environment)
         Environment environmentToStore =  new Environment(environment);
         encryptGatewayConfigurationValues(null, environmentToStore);
         apiMgtDAO.addEnvironment(tenantDomain, environment);
-
-        if (environment.getProvider().equals(APIConstants.EXTERNAL_GATEWAY_VENDOR)) {
-            GatewayConfigurationService gatewayConfigurationService = new GatewayConfigurationServiceImpl();
-            gatewayConfigurationService.addGatewayConfiguration(tenantDomain, environment.getName(),
-                    environment.getGatewayType(), environment);
-        }
         return environment;
     }
 
@@ -220,11 +214,6 @@ public void deleteEnvironment(String tenantDomain, String uuid) throws APIManage
                     ExceptionCodes.from(ExceptionCodes.READONLY_GATEWAY_ENVIRONMENT, String.format("UUID '%s'", uuid)));
         }
         apiMgtDAO.deleteEnvironment(uuid);
-
-        if (existingEnv.getProvider().equals(APIConstants.EXTERNAL_GATEWAY_VENDOR)) {
-            GatewayConfigurationService gatewayConfigurationService = new GatewayConfigurationServiceImpl();
-            gatewayConfigurationService.removeGatewayConfiguration(tenantDomain, existingEnv.getName());
-        }
     }
 
     @Override
@@ -262,13 +251,6 @@ public Environment updateEnvironment(String tenantDomain, Environment environmen
         // Perform a separate task of updating gateway label names
         updateGatewayLabelNameForGatewayPolicies(existingEnv.getDisplayName(), updatedEnvironment.getDisplayName(),
                 tenantDomain);
-
-        if (environment.getProvider().equals(APIConstants.EXTERNAL_GATEWAY_VENDOR)) {
-            GatewayConfigurationService gatewayConfigurationService = new GatewayConfigurationServiceImpl();
-            gatewayConfigurationService.updateGatewayConfiguration(tenantDomain, environment.getName(),
-                    environment.getType(), environment);
-        }
-
         return updatedEnvironment;
     }
 

components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/notifier/ExternalGatewayNotifier.java

@@ -167,7 +167,7 @@ private boolean isExternalGatewayAvailableToDeployment(DeployAPIInGatewayEvent d
             Map<String, Environment> environments = APIUtil.getEnvironments(deployAPIInGatewayEvent.getTenantDomain());
             for (String label : gatewayLabels) {
                 Environment environment = environments.get(label);
-                if (environment != null && !APIConstants.WSO2_GATEWAY_ENVIRONMENT.equals(environment.getGatewayType())) {
+                if (environment != null && !APIConstants.WSO2_GATEWAY_ENVIRONMENT.equals(environment.getProvider())) {
                     return true;
                 }
             }

components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java

@@ -10407,7 +10407,7 @@ public static boolean isAnyExternalGateWayProviderExists(String tenantDomain) {
         try {
             Map<String, Environment> environments = getEnvironments(tenantDomain);
             for (Environment environment : environments.values()) {
-                if (!APIConstants.WSO2_GATEWAY_ENVIRONMENT.equals(environment.getGatewayType())) {
+                if (!APIConstants.WSO2_GATEWAY_ENVIRONMENT.equals(environment.getProvider())) {
                     return true;
                 }
             }