Merge pull request #12465 from piyumaldk/master

[Public] [Fix] Fix JsonPrimitive casting exception
wso2 · Jun 14, 2024 · c9e3d9c · c9e3d9c
2 parents a5905ad + d48a673
commit c9e3d9c
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/...pi.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/utils/ImportUtils.java b/...pi.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/utils/ImportUtils.java
@@ -293,10 +293,14 @@ public static void addApplicationKey(String username, Application application, A
  JsonObject jsonObject = gson.fromJson(additionalProperties, JsonObject.class);
  Set<String> keysSet = jsonObject.keySet();
  for (String key : keysSet) {
- if (jsonObject.getAsJsonPrimitive(key).isNumber()) {
- jsonObject.addProperty(key, String.valueOf(jsonObject.getAsJsonPrimitive(key).getAsLong()));
+ if (jsonObject.get(key).isJsonPrimitive()) {
+ if (jsonObject.getAsJsonPrimitive(key).isNumber()) {
+ jsonObject.addProperty(key, String.valueOf(jsonObject.getAsJsonPrimitive(key).getAsLong()));
+ } else {
+ jsonObject.addProperty(key, jsonObject.getAsJsonPrimitive(key).getAsString());
+ }
  } else {
- jsonObject.addProperty(key, jsonObject.getAsJsonPrimitive(key).getAsString());
+ jsonObject.addProperty(key, jsonObject.get(key).toString());
  }
  }
  jsonParamObj.addProperty(APIConstants.JSON_ADDITIONAL_PROPERTIES, jsonObject.toString());