Merge pull request #12151 from HeshanSudarshana/master-advance-endpoi…

…nt-config Preserve advanceEndpointConfig when setting endpoint config
wso2 · Sep 15, 2023 · 49a131c · 49a131c
2 parents 4ca0bd2 + b20d5dd
commit 49a131c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/...t/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConstants.java b/...t/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConstants.java
@@ -1618,6 +1618,8 @@ private ConfigParameters() {
     public static final String X_WSO2_REQUEST_INTERCEPTOR = "x-wso2-request-interceptor";
     public static final String X_WSO2_RESPONSE_INTERCEPTOR = "x-wso2-response-interceptor";
     public static final String X_WSO2_ENDPOINT_TYPE = "type";
+    public static final String ADVANCE_ENDPOINT_CONFIG = "advanceEndpointConfig";
+    public static final String TIMEOUT_IN_MILLIS = "timeoutInMillis";
 
     //API Constants
     public static final String API_DATA_NAME = "name";

diff --git a/...rbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/definitions/OASParserUtil.java b/...rbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/definitions/OASParserUtil.java
@@ -1388,6 +1388,17 @@ private static ObjectNode setPrimaryConfig(JSONObject endpointConfig, boolean is
             ObjectNode endpointResult = objectMapper.createObjectNode();
             endpointResult.set(APIConstants.ENDPOINT_URLS, endpointsArray);
             endpointResult.put(APIConstants.X_WSO2_ENDPOINT_TYPE, type);
+            if (primaryEndpoints.has(APIConstants.ADVANCE_ENDPOINT_CONFIG)
+                    && primaryEndpoints.get(APIConstants.ADVANCE_ENDPOINT_CONFIG) != JSONObject.NULL) {
+                JSONObject advanceEndpointConfig = primaryEndpoints.getJSONObject(APIConstants.ADVANCE_ENDPOINT_CONFIG);
+                ObjectNode advanceEndpointsObject = objectMapper.createObjectNode();
+                if (advanceEndpointConfig.has(APIConstants.TIMEOUT_IN_MILLIS)
+                        && advanceEndpointConfig.get(APIConstants.TIMEOUT_IN_MILLIS) != JSONObject.NULL) {
+                    advanceEndpointsObject.put(APIConstants.TIMEOUT_IN_MILLIS,
+                            advanceEndpointConfig.getInt(APIConstants.TIMEOUT_IN_MILLIS));
+                    endpointResult.set(APIConstants.ADVANCE_ENDPOINT_CONFIG, advanceEndpointsObject);
+                }
+            }
             return endpointResult;
         }
         return null;