Resolve review comments

Author: NethmiRanasinghe

Diff for: components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/ExceptionCodes.java

@@ -122,6 +122,7 @@ public enum ExceptionCodes implements ErrorHandler {
     CANNOT_CREATE_API_VERSION(900362, "New API Version cannot be created from a different provider", 409, "Initial provider of an API must be preserved in all versions of that API"),
     INTERNAL_ERROR_WHILE_UPDATING_API(900363, "Internal Server Error occurred while updating the API", 500, "Internal Server Error. '%s'"),
     ERROR_WHILE_UPDATING_MANDATORY_PROPERTIES(903010, "Error while updating required properties", 400, "Error while updating required properties."),
+    ERROR_WHILE_VALIDATING_MANDATORY_PROPERTIES(903015, "Error while validating required properties", 400, "Error while validating required properties."),
 
     //Lifecycle related codes
     API_UPDATE_FORBIDDEN_PER_LC(900380, "Insufficient permission to update the API", 403,

Diff for: components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIProviderImpl.java

@@ -3342,21 +3342,6 @@ public APIStateChangeResponse changeLifeCycleStatus(String orgId, ApiTypeWrapper
             boolean isApiProduct = apiTypeWrapper.isAPIProduct();
             String workflowType;
 
-            if (!apiTypeWrapper.isAPIProduct()){
-                // validate custom API properties
-                if (StringUtils.equals(action, APIConstants.LC_PUBLISH_LC_STATE)) {
-                    org.json.simple.JSONArray customProperties = APIUtil.getCustomProperties(this.tenantDomain);
-                    List<String> errorProperties = APIUtil.validateMandatoryProperties(customProperties,
-                            apiTypeWrapper.getApi().getAdditionalProperties());
-
-                    if (!errorProperties.isEmpty()) {
-                        String errorString = " : " + String.join(", ", errorProperties);
-                        throw new APIManagementException(errorString, ExceptionCodes.from(ExceptionCodes
-                                .ERROR_WHILE_UPDATING_MANDATORY_PROPERTIES));
-                    }
-                }
-            }
-
             if (isApiProduct) {
                 APIProduct apiProduct = apiTypeWrapper.getApiProduct();
                 providerName = apiProduct.getId().getProviderName();
@@ -3369,6 +3354,19 @@ public APIStateChangeResponse changeLifeCycleStatus(String orgId, ApiTypeWrapper
                 apiOrApiProductId = apiMgtDAO.getAPIProductId(apiTypeWrapper.getApiProduct().getId());
                 workflowType = WorkflowConstants.WF_TYPE_AM_API_PRODUCT_STATE;
             } else {
+                // validate mandatory API properties
+                if (StringUtils.equals(action, APIConstants.LC_PUBLISH_LC_STATE)) {
+                    org.json.simple.JSONArray customProperties = APIUtil.getCustomProperties(this.tenantDomain);
+                    List<String> errorProperties = APIUtil.validateMandatoryProperties(customProperties,
+                            apiTypeWrapper.getApi().getAdditionalProperties());
+
+                    if (!errorProperties.isEmpty()) {
+                        String errorString = " : " + String.join(", ", errorProperties);
+                        throw new APIManagementException(errorString, ExceptionCodes.from(ExceptionCodes
+                                .ERROR_WHILE_VALIDATING_MANDATORY_PROPERTIES));
+                    }
+                }
+
                 API api = apiTypeWrapper.getApi();
                 providerName = api.getId().getProviderName();
                 apiName = api.getId().getApiName();

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

@@ -11606,7 +11606,7 @@ public static void validateApiWithFederatedGateway(API api) throws APIManagement
     /**
      * This method is used to validate the mandatory custom properties of an API
      *
-     * @param customProperties custom properties of the API
+     * @param customProperties        custom properties of the API
      * @param additionalPropertiesMap additional properties to validate
      * @return list of erroneous property names. returns an empty array if there are no errors.
      */