changed from name to experiment_name.

Signed-off-by: msvinaykumar <[email protected]>
kruize · Dec 2, 2022 · e30e1fa · e30e1fa
1 parent 5ec136c
commit e30e1fa
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 27 deletions.
diff --git a/src/main/java/com/autotune/analyzer/Analyzer.java b/src/main/java/com/autotune/analyzer/Analyzer.java
@@ -53,8 +53,8 @@ public static void addServlets(ServletContextHandler context) {
         context.addServlet(SearchSpace.class, ServerContext.SEARCH_SPACE);
         context.addServlet(ListExperiments.class, ServerContext.LIST_EXPERIMENTS);
         context.addServlet(ExperimentsSummary.class, ServerContext.EXPERIMENTS_SUMMARY);
-        context.addServlet(CreateExperimentAPI.class, ServerContext.CREATE_EXPERIMENT);
-        context.addServlet(updateResultsAPI.class, ServerContext.UPDATE_RESULTS);
-        context.addServlet(RecommendationAPI.class,ServerContext.RECOMMEND_RESULTS);
+        context.addServlet(CreateExperiment.class, ServerContext.CREATE_EXPERIMENT);
+        context.addServlet(updateResults.class, ServerContext.UPDATE_RESULTS);
+        context.addServlet(Recommendation.class,ServerContext.RECOMMEND_RESULTS);
     }
 }
diff --git a/...nalyzer/services/CreateExperimentAPI.java → ...e/analyzer/services/CreateExperiment.java b/...nalyzer/services/CreateExperimentAPI.java → ...e/analyzer/services/CreateExperiment.java
@@ -43,9 +43,9 @@
  * REST API to create experiments to Analyser for monitoring metrics.
  */
 @WebServlet(asyncSupported = true)
-public class CreateExperimentAPI extends HttpServlet {
+public class CreateExperiment extends HttpServlet {
     private static final long serialVersionUID = 1L;
-    private static final Logger LOGGER = LoggerFactory.getLogger(CreateExperimentAPI.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CreateExperiment.class);
     ConcurrentHashMap<String, JsonObject> mainAutoTuneOperatorMap = new ConcurrentHashMap<>();
 
     @Override
@@ -57,12 +57,18 @@ public void init(ServletConfig config) throws ServletException {
 
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        String inputData = request.getReader().lines().collect(Collectors.joining());
-        List<JsonObject> autoTuneOperatorDataList = Arrays.asList(new Gson().fromJson(inputData, JsonObject[].class));
-        for (JsonObject jsonObject : autoTuneOperatorDataList) {
-            this.mainAutoTuneOperatorMap.put(jsonObject.get("name").toString(), jsonObject);
+        try {
+            String inputData = request.getReader().lines().collect(Collectors.joining());
+            List<JsonObject> autoTuneOperatorDataList = Arrays.asList(new Gson().fromJson(inputData, JsonObject[].class));
+            for (JsonObject jsonObject : autoTuneOperatorDataList) {
+                this.mainAutoTuneOperatorMap.put(jsonObject.get("experiment_name").toString(), jsonObject);
+            }
+            sendSuccessResponse(response);
+        }catch(Exception e){
+            LOGGER.error("Exception due to :"+ e.getMessage());
+            sendErrorResponse(response,e,HttpServletResponse.SC_BAD_REQUEST,e.getMessage());
+            e.printStackTrace();
         }
-        sendSuccessResponse(response);
     }
 
     private void sendSuccessResponse(HttpServletResponse response) throws IOException {

diff --git a/.../analyzer/services/RecommendationAPI.java → ...une/analyzer/services/Recommendation.java b/.../analyzer/services/RecommendationAPI.java → ...une/analyzer/services/Recommendation.java
@@ -42,9 +42,9 @@
  * Rest API used to recommend right configuration.
  */
 @WebServlet(asyncSupported = true)
-public class RecommendationAPI extends HttpServlet {
+public class Recommendation extends HttpServlet {
     private static final long serialVersionUID = 1L;
-    private static final Logger LOGGER = LoggerFactory.getLogger(RecommendationAPI.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(Recommendation.class);
     ConcurrentHashMap<String, JsonObject> mainAutoTuneOperatorMap = new ConcurrentHashMap<>();
     KubernetesServices kubernetesServices = null;
 

diff --git a/...e/analyzer/services/updateResultsAPI.java → ...tune/analyzer/services/updateResults.java b/...e/analyzer/services/updateResultsAPI.java → ...tune/analyzer/services/updateResults.java
@@ -46,9 +46,9 @@
  * REST API used to update metric results to a given experiments.
  */
 @WebServlet(asyncSupported = true)
-public class updateResultsAPI extends HttpServlet {
+public class updateResults extends HttpServlet {
     private static final long serialVersionUID = 1L;
-    private static final Logger LOGGER = LoggerFactory.getLogger(updateResultsAPI.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(updateResults.class);
     ConcurrentHashMap<String, JsonObject> mainAutoTuneOperatorMap = new ConcurrentHashMap<>();
     KubernetesServices kubernetesServices = null;
 
@@ -62,21 +62,27 @@ public void init(ServletConfig config) throws ServletException {
 
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        String inputData = request.getReader().lines().collect(Collectors.joining());
-        List<JsonObject> autoTuneOperatorDataList = Arrays.asList(new Gson().fromJson(inputData, JsonObject[].class));
-        for (JsonObject jsonObject : autoTuneOperatorDataList) {
-            JsonObject exp = this.mainAutoTuneOperatorMap.get(jsonObject.get("name").toString());
-            if (exp.get("results") == null) {
-                JsonArray jsonArray = new JsonArray();
-                jsonArray.add(jsonObject);
-                exp.add("results", jsonArray);
-            } else {
-                JsonArray jsonArray = exp.getAsJsonArray("results");
-                jsonArray.add(jsonObject);
-                exp.add("results", jsonArray);
+        try {
+            String inputData = request.getReader().lines().collect(Collectors.joining());
+            List<JsonObject> autoTuneOperatorDataList = Arrays.asList(new Gson().fromJson(inputData, JsonObject[].class));
+            for (JsonObject jsonObject : autoTuneOperatorDataList) {
+                JsonObject exp = this.mainAutoTuneOperatorMap.get(jsonObject.get("experiment_name").toString());
+                if (exp.get("results") == null) {
+                    JsonArray jsonArray = new JsonArray();
+                    jsonArray.add(jsonObject);
+                    exp.add("results", jsonArray);
+                } else {
+                    JsonArray jsonArray = exp.getAsJsonArray("results");
+                    jsonArray.add(jsonObject);
+                    exp.add("results", jsonArray);
+                }
             }
+            sendSuccessResponse(response);
+        }catch(Exception e){
+            LOGGER.error("Exception due to :"+ e.getMessage());
+            sendErrorResponse(response,e,HttpServletResponse.SC_BAD_REQUEST,e.getMessage());
+            e.printStackTrace();
         }
-        sendSuccessResponse(response);
     }
 
     private void sendSuccessResponse(HttpServletResponse response) throws IOException {