Merge pull request #12447 from chashikajw/fix-slack-github-urls-update

Fix the update issue of Slack and GitHub URLs of the API
wso2 · Jun 28, 2024 · da72e46 · da72e46
2 parents 2948146 + 44e63ba
commit da72e46
Showing 1 changed file with 7 additions and 3 deletions.
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
@@ -341,11 +341,15 @@ public static API fromDTOtoAPI(APIDTO dto, String provider) throws APIManagement
  Map<String, APIInfoAdditionalPropertiesMapDTO> additionalPropertiesMap = dto.getAdditionalPropertiesMap();
  if (additionalPropertiesMap != null && !additionalPropertiesMap.isEmpty()) {
  for (Map.Entry<String, APIInfoAdditionalPropertiesMapDTO> entry : additionalPropertiesMap.entrySet()) {
+ String propertyKey = null;
  if (entry.getValue().isDisplay()) {
- model.addProperty(entry.getKey() + APIConstants.API_RELATED_CUSTOM_PROPERTIES_SURFIX,
- entry.getValue().getValue());
+ propertyKey = entry.getKey() + APIConstants.API_RELATED_CUSTOM_PROPERTIES_SURFIX;
  } else {
- model.addProperty(entry.getKey(), entry.getValue().getValue());
+ propertyKey = entry.getKey();
+ }
+ // If this property already added from the additional properties, avoid overriding it
+ if (propertyKey != null && !model.getAdditionalProperties().containsKey(propertyKey)) {
+ model.addProperty(propertyKey, entry.getValue().getValue());
  }
  }
  }