Adding the Json Parser Object as the Class Member Variable (#503)

Adding the Json Parser Object as the Class Member Variable
opendistro-for-elasticsearch · Nov 15, 2020 · d217727 · d217727
1 parent 4442171
commit d217727
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/...opendistro/elasticsearch/performanceanalyzer/rca/persistence/actions/PersistedAction.java b/...opendistro/elasticsearch/performanceanalyzer/rca/persistence/actions/PersistedAction.java
@@ -108,14 +108,14 @@ public static class SQL_SCHEMA_CONSTANTS {
 
     }
 
-    public JsonElement toJson() {
+    public JsonElement toJson(JsonParser jsonParser) {
         JsonObject summaryObj = new JsonObject();
         summaryObj.addProperty(SQL_SCHEMA_CONSTANTS.NODE_IPS_NAME, this.nodeIps);
         summaryObj.addProperty(SQL_SCHEMA_CONSTANTS.MUTED_NAME, this.muted);
         summaryObj.addProperty(SQL_SCHEMA_CONSTANTS.ACTION_COL_NAME, this.actionName);
         summaryObj.addProperty(SQL_SCHEMA_CONSTANTS.TIMESTAMP_COL_NAME, this.timestamp);
         summaryObj.addProperty(SQL_SCHEMA_CONSTANTS.NODE_IDS_NAME, this.nodeIds);
-        summaryObj.add(SQL_SCHEMA_CONSTANTS.SUMMARY_NAME, new JsonParser().parse(this.summary));
+        summaryObj.add(SQL_SCHEMA_CONSTANTS.SUMMARY_NAME, jsonParser.parse(this.summary));
         summaryObj.addProperty(SQL_SCHEMA_CONSTANTS.ACTIONABLE_NAME, this.actionable);
         summaryObj.addProperty(SQL_SCHEMA_CONSTANTS.COOLOFFPERIOD_NAME, this.coolOffPeriod);
         return summaryObj;

diff --git a/...m/amazon/opendistro/elasticsearch/performanceanalyzer/rest/QueryActionRequestHandler.java b/...m/amazon/opendistro/elasticsearch/performanceanalyzer/rest/QueryActionRequestHandler.java
@@ -38,7 +38,6 @@
 
 /**
  * Request Handler that supports querying the latest action set
- *TODO: Update with actual Action Values here and in the README.
  *
  * <p>To get the response for the latest action set suggested via DM Framework
  * curl --url "localhost:9600/_opendistro/_performanceanalyzer/actions" -XGET
@@ -75,9 +74,11 @@ public class QueryActionRequestHandler extends MetricsHandler implements HttpHan
     private static final Logger LOG = LogManager.getLogger(QueryActionRequestHandler.class);
     private Persistable persistable;
     private AppContext appContext;
+    JsonParser jsonParser;
 
     public QueryActionRequestHandler(final AppContext appContext) {
         this.appContext = appContext;
+         jsonParser = new JsonParser();
     }
 
     @Override
@@ -147,15 +148,15 @@ private JsonElement getActionData(Persistable persistable) {
                 JsonArray response = new JsonArray();
                 if (actionSet != null) {
                     for (PersistedAction action : actionSet) {
-                        response.add(action.toJson());
+                        response.add(action.toJson(this.jsonParser));
                     }
                     result.add(ACTION_SET_JSON_NAME, response);
                 } else {
                     result.add(ACTION_SET_JSON_NAME, new JsonArray());
                 }
             } catch (Exception e) {
                 LOG.error("Fail to query DB, message : {}", e.getMessage());
-                result.add("error", new JsonParser().parse("Fail to query db").getAsJsonObject());
+                result.add("error", this.jsonParser.parse("Fail to query db").getAsJsonObject());
             }
         }
         return result;