From b9053a09ef43892a0dcd4dfbd3f60932e05dd0ae Mon Sep 17 00:00:00 2001 From: Ashera Silva Date: Sat, 23 Mar 2024 18:15:03 +0530 Subject: [PATCH] Minor fixes --- .../wso2/carbon/apimgt/impl/APIConstants.java | 2 +- .../src/main/resources/devportal-api.yaml | 4 ++-- .../api/store/v1/impl/ApisApiServiceImpl.java | 18 +++++++++++++++--- .../src/main/resources/config/api-manager.xml | 8 ++++---- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConstants.java b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConstants.java index 8a80736b0108..adf627aa26d6 100755 --- a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConstants.java +++ b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConstants.java @@ -1269,7 +1269,7 @@ public static class ApplicationStatus { public static final String DELETE_PENDING = "DELETE_PENDING"; } - public static class APIRevisionStatus { // + public static class APIRevisionStatus { public static final String API_REVISION_CREATED = "CREATED"; public static final String API_REVISION_APPROVED = "APPROVED"; diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/src/main/resources/devportal-api.yaml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/src/main/resources/devportal-api.yaml index 1c8b283c784a..93b071249bc4 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/src/main/resources/devportal-api.yaml +++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/src/main/resources/devportal-api.yaml @@ -5362,11 +5362,11 @@ components: properties too will affect the maximum password length allowed and an intersection of all conditions will be considered finally to validate the password. - isApiChatEnabled: + apiChatEnabled: type: boolean description: Specifies whether API Chat feature is enabled. default: true - isAIFeatureAuthTokenProvided: + aiAuthTokenProvided: type: boolean description: Checks if the auth token is provided for AI service usage. default: false diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/impl/ApisApiServiceImpl.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/impl/ApisApiServiceImpl.java index 9c7d7854993a..a266766547b4 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/impl/ApisApiServiceImpl.java +++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/impl/ApisApiServiceImpl.java @@ -18,8 +18,6 @@ package org.wso2.carbon.apimgt.rest.api.store.v1.impl; -import com.google.gson.Gson; -import com.google.gson.JsonParser; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -30,7 +28,21 @@ import org.wso2.carbon.apimgt.api.APIConsumer; import org.wso2.carbon.apimgt.api.APIManagementException; import org.wso2.carbon.apimgt.api.ExceptionCodes; -import org.wso2.carbon.apimgt.api.model.*; +import org.wso2.carbon.apimgt.api.model.API; +import org.wso2.carbon.apimgt.api.model.APIChatAPISpec; +import org.wso2.carbon.apimgt.api.model.APIChatExecutionResponse; +import org.wso2.carbon.apimgt.api.model.APIChatTestExecutionInfo; +import org.wso2.carbon.apimgt.api.model.APIChatTestInitializerInfo; +import org.wso2.carbon.apimgt.api.model.APIIdentifier; +import org.wso2.carbon.apimgt.api.model.APIRating; +import org.wso2.carbon.apimgt.api.model.ApiTypeWrapper; +import org.wso2.carbon.apimgt.api.model.Comment; +import org.wso2.carbon.apimgt.api.model.CommentList; +import org.wso2.carbon.apimgt.api.model.Documentation; +import org.wso2.carbon.apimgt.api.model.DocumentationContent; +import org.wso2.carbon.apimgt.api.model.Environment; +import org.wso2.carbon.apimgt.api.model.ResourceFile; +import org.wso2.carbon.apimgt.api.model.Tier; import org.wso2.carbon.apimgt.api.model.graphql.queryanalysis.GraphqlComplexityInfo; import org.wso2.carbon.apimgt.api.model.graphql.queryanalysis.GraphqlSchemaType; import org.wso2.carbon.apimgt.api.model.webhooks.Topic; diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/config/api-manager.xml b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/config/api-manager.xml index e04322e1b09d..b9710d627fcc 100644 --- a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/config/api-manager.xml +++ b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/config/api-manager.xml @@ -192,9 +192,9 @@ true - abc + - https://test.com + http://localhost:9090 @@ -206,9 +206,9 @@ true - abc + - https://test.com + http://localhost:9090