redo the fix for ppl too

Signed-off-by: Jialiang Liang <jiallian@amazon.com>

Author: RyanL1997

plugin/src/main/java/org/opensearch/sql/plugin/request/PPLQueryRequestFactory.java

@@ -59,24 +59,24 @@ private static PPLQueryRequest parsePPLRequestFromPayload(RestRequest restReques
     boolean pretty = getPrettyOption(restRequest.params());
     try {
       jsonContent = new JSONObject(content);
+      PPLQueryRequest pplRequest =
+          new PPLQueryRequest(
+              jsonContent.getString(PPL_FIELD_NAME),
+              jsonContent,
+              restRequest.path(),
+              format.getFormatName());
+      // set sanitize option if csv format
+      if (format.equals(Format.CSV)) {
+        pplRequest.sanitize(getSanitizeOption(restRequest.params()));
+      }
+      // set pretty option
+      if (pretty) {
+        pplRequest.style(JsonResponseFormatter.Style.PRETTY);
+      }
+      return pplRequest;
     } catch (JSONException e) {
       throw new IllegalArgumentException("Failed to parse request payload", e);
     }
-    PPLQueryRequest pplRequest =
-        new PPLQueryRequest(
-            jsonContent.getString(PPL_FIELD_NAME),
-            jsonContent,
-            restRequest.path(),
-            format.getFormatName());
-    // set sanitize option if csv format
-    if (format.equals(Format.CSV)) {
-      pplRequest.sanitize(getSanitizeOption(restRequest.params()));
-    }
-    // set pretty option
-    if (pretty) {
-      pplRequest.style(JsonResponseFormatter.Style.PRETTY);
-    }
-    return pplRequest;
   }
 
   private static Format getFormat(Map<String, String> requestParams, String path) {

plugin/src/main/java/org/opensearch/sql/plugin/rest/RestPPLQueryAction.java

@@ -16,7 +16,6 @@
 import java.util.Set;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.json.JSONException;
 import org.opensearch.OpenSearchException;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.rest.RestStatus;
@@ -60,8 +59,7 @@ private static boolean isClientError(Exception e) {
         || e instanceof QueryEngineException
         || e instanceof SyntaxCheckException
         || e instanceof DataSourceClientException
-        || e instanceof IllegalAccessException
-        || e instanceof JSONException;
+        || e instanceof IllegalAccessException;
   }
 
   @Override