Update retrieval of URITemplates, scopes and roles from swagger in the local entry #7401
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chamilaadhi
reviewed
Oct 10, 2019
| return (ArrayList<LinkedHashMap>) swaggerObjectAPIM.get(APIConstants.SWAGGER_X_WSO2_SCOPES); | ||
| if (openAPI.getExtensions() != null) { | ||
| LinkedHashMap swaggerWSO2Security = (LinkedHashMap) openAPI.getExtensions() | ||
| .get(APIConstants.SWAGGER_X_WSO2_SECURITY); |
There was a problem hiding this comment.
I think you need to do a Null check for openAPI.getExtensions().get(APIConstants.SWAGGER_X_WSO2_SECURITY) as well because there could be a NPE when casting to LinkedHashMap when there is no when get(APIConstants.SWAGGER_X_WSO2_SECURITY) becomes null. We could add the null check to the if condition
| LinkedHashMap<String, Object> scopeBindings = | ||
| (LinkedHashMap<String, Object>) extensions.get(APIConstants.SWAGGER_X_SCOPES_BINDINGS); | ||
| if (scopeBindings != null) { | ||
| return (String) scopeBindings.get(resourceScope); |
| LinkedHashMap swaggerObjectAPIM = (LinkedHashMap) swaggerWSO2Security | ||
| .get(APIConstants.SWAGGER_OBJECT_NAME_APIM); | ||
| if (swaggerObjectAPIM != null) { | ||
| ArrayList<LinkedHashMap> apiScopes = (ArrayList<LinkedHashMap>) swaggerObjectAPIM.get(APIConstants.SWAGGER_X_WSO2_SCOPES); |
chamilaadhi
approved these changes
Oct 10, 2019
ChamodDamitha
changed the title
uvindra
approved these changes
Oct 10, 2019
dushaniw
reviewed
Jul 20, 2020
| @@ -539,15 +545,15 @@ private boolean isResourcePathMatching(String resourceString, ResourceInfoDTO re | |||
| } | |||
|
|
|||
| @MethodStats | |||
| private APIInfoDTO doGetAPIInfo(String context, String apiVersion) throws APISecurityException { | |||
| ArrayList<URITemplate> uriTemplates = getAllURITemplates(context, apiVersion); | |||
| private APIInfoDTO doGetAPIInfo(MessageContext messageContext, String context, String apiVersion) throws APISecurityException { | |||
There was a problem hiding this comment.
arent we exceeding the max column length? 120
There was a problem hiding this comment.
Fixed in #9250
dushaniw
reviewed
Jul 20, 2020
| private APIInfoDTO doGetAPIProductInfo(String context, String apiVersion) throws APISecurityException { | ||
| ArrayList<URITemplate> uriTemplates = getAPIProductURITemplates(context, apiVersion); | ||
| private APIInfoDTO doGetAPIProductInfo(MessageContext messageContext, String context, String apiVersion) throws APISecurityException { | ||
| ArrayList<URITemplate> uriTemplates = getAPIProductURITemplates(messageContext, context, apiVersion); |
There was a problem hiding this comment.
same here, seems we are exceeding 120
There was a problem hiding this comment.
Fixed in #9250
dushaniw
reviewed
Jul 20, 2020
| * @param context API context of API | ||
| * @param apiVersion Version of API | ||
| * @param requestPath Incoming request path | ||
| * @param httpMethod http method of request | ||
| * @return verbInfoDTO which contains throttling tier for given resource and verb+resource key | ||
| */ | ||
| public VerbInfoDTO getVerbInfoDTOFromAPIData(String context, String apiVersion, String requestPath, String httpMethod) | ||
| public VerbInfoDTO getVerbInfoDTOFromAPIData(MessageContext messageContext, String context, String apiVersion, String requestPath, String httpMethod) |
There was a problem hiding this comment.
Fixed in #9250
....gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/security/APIKeyValidator.java
Show resolved
Hide resolved
wso2-jenkins-bot
added a commit
that referenced
this pull request
Jan 23, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This will fix wso2/product-apim#6224