Fix issues encountered during migration testing

tharikaGitHub · Oct 4, 2024 · 19b10aa · 19b10aa
1 parent aea47db
commit 19b10aa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/...wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/AbstractAPIManager.java b/...wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/AbstractAPIManager.java
@@ -174,7 +174,7 @@ protected void populateDefaultVersion(API api) throws APIManagementException {
         apiMgtDAO.setDefaultVersion(api);
     }
     protected void populateGatewayVendor(API api) throws APIManagementException {
-        if (api.getGatewayVendor() == null) {
+        if (api.getGatewayVendor() == null || "null".equals(api.getGatewayVendor())) {
             String gatewayVendor = apiMgtDAO.getGatewayVendorByAPIUUID(api.getUuid());
             if (gatewayVendor == null) {
                 gatewayVendor = APIConstants.WSO2_GATEWAY_ENVIRONMENT;

diff --git a/.../org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/ApiMgtDAO.java b/.../org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/ApiMgtDAO.java
@@ -17129,8 +17129,13 @@ public SharedScopeUsage getSharedScopeUsage(String uuid, int tenantId) throws AP
                     String revisionUuid = apiUsageResultSet.getString("REVISION_UUID");
                     String GET_SHARED_SCOPE_URI_USAGE_BY_TENANT = SQLConstants.GET_SHARED_SCOPE_URI_USAGE_IN_CURRENT_APIS_BY_TENANT;
                     if (StringUtils.isNotEmpty(revisionUuid)) {
-                        usedApi.setRevision(true);
-                        GET_SHARED_SCOPE_URI_USAGE_BY_TENANT = SQLConstants.GET_SHARED_SCOPE_URI_USAGE_IN_REVISIONS_BY_TENANT;
+                        APIRevision revision = getRevisionByRevisionUUID(connection, revisionUuid);
+                        // This check is done to make sure this does not belong to a Current API entry of an
+                        // API Product url mapping in the AM_API_URL_MAPPING table
+                        if (revision != null) {
+                            usedApi.setRevision(true);
+                            GET_SHARED_SCOPE_URI_USAGE_BY_TENANT = SQLConstants.GET_SHARED_SCOPE_URI_USAGE_IN_REVISIONS_BY_TENANT;
+                        }
                     }
 
                     try (PreparedStatement psForUriUsage = connection

diff --git a/...ain/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/APIMappingUtil.java b/...ain/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/APIMappingUtil.java
@@ -1691,7 +1691,7 @@ private static void setMaxTpsFromModelToApiDTO(API api, APIDTO dto) {
                         convertFromMilliseconds(api.getSandboxTimeUnit())));
             }
             AIConfiguration aiConfiguration = api.getAiConfiguration();
-            if (aiConfiguration.getTokenBasedThrottlingConfiguration() != null
+            if (aiConfiguration != null && aiConfiguration.getTokenBasedThrottlingConfiguration() != null
                     && aiConfiguration.getTokenBasedThrottlingConfiguration().isTokenBasedThrottlingEnabled()) {
                 APIMaxTpsTokenBasedThrottlingConfigurationDTO throttlingConfigurationsDTO
                         = buildThrottlingConfigurationDTO(aiConfiguration.getTokenBasedThrottlingConfiguration());