Add sub fault categories for schema validation errors

SavinduDimal · Feb 8, 2024 · 285d72d · 285d72d
1 parent 7398788
commit 285d72d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/...java/org/wso2/carbon/apimgt/common/analytics/publishers/dto/enums/FaultSubCategories.java b/...java/org/wso2/carbon/apimgt/common/analytics/publishers/dto/enums/FaultSubCategories.java
@@ -28,6 +28,8 @@ public enum Other implements FaultSubCategory {
         MEDIATION_ERROR,
         RESOURCE_NOT_FOUND,
         METHOD_NOT_ALLOWED,
+        INVALID_REQUEST_SCHEMA,
+        INVALID_RESPONSE_SCHEMA,
         UNCLASSIFIED
     }
 

diff --git a/.../src/main/java/org/wso2/carbon/apimgt/gateway/handlers/analytics/FaultCodeClassifier.java b/.../src/main/java/org/wso2/carbon/apimgt/gateway/handlers/analytics/FaultCodeClassifier.java
@@ -17,6 +17,7 @@
 
 package org.wso2.carbon.apimgt.gateway.handlers.analytics;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.synapse.MessageContext;
@@ -127,6 +128,10 @@ protected FaultSubCategory getOtherFaultSubCategory(int errorCode) {
             return FaultSubCategories.Other.METHOD_NOT_ALLOWED;
         } else if (isResourceNotFound()) {
             return FaultSubCategories.Other.RESOURCE_NOT_FOUND;
+        } else if (isRequestSchemaInvalid()) {
+            return FaultSubCategories.Other.INVALID_REQUEST_SCHEMA;
+        } else if (isResponseSchemaInvalid()) {
+            return FaultSubCategories.Other.INVALID_RESPONSE_SCHEMA;
         } else {
             return FaultSubCategories.Other.UNCLASSIFIED;
         }
@@ -149,4 +154,24 @@ public boolean isMethodNotAllowed() {
         }
         return false;
     }
+
+    private boolean isRequestSchemaInvalid() {
+        if (messageContext.getPropertyKeySet().contains(SynapseConstants.ERROR_DETAIL)) {
+            String errorDetail = (String) messageContext.getProperty(SynapseConstants.ERROR_DETAIL);
+            String errorMessage = "Schema validation failed in the Request: ";
+            return messageContext.getPropertyKeySet().contains(RESTConstants.PROCESSED_API)
+                    && StringUtils.isNotEmpty(errorDetail) && errorDetail.contains(errorMessage);
+        }
+        return false;
+    }
+
+    private boolean isResponseSchemaInvalid() {
+        if (messageContext.getPropertyKeySet().contains(SynapseConstants.ERROR_DETAIL)) {
+            String errorDetail = (String) messageContext.getProperty(SynapseConstants.ERROR_DETAIL);
+            String errorMessage = "Schema validation failed in the Response: ";
+            return messageContext.getPropertyKeySet().contains(RESTConstants.PROCESSED_API)
+                    && StringUtils.isNotEmpty(errorDetail) && errorDetail.contains(errorMessage);
+        }
+        return false;
+    }
 }
diff --git a/...pimgt.rest.api.service.catalog.feature/src/main/resources/runtimes/cxf3/snakeyaml-2.0.jar b/...pimgt.rest.api.service.catalog.feature/src/main/resources/runtimes/cxf3/snakeyaml-2.0.jar