From cb7914cf1eabf64ba59cce9f1f320e4527740956 Mon Sep 17 00:00:00 2001 From: msvinaykumar Date: Sun, 13 Aug 2023 00:23:18 +0530 Subject: [PATCH] merged conflicts Signed-off-by: msvinaykumar --- .../services/UpdateRecommendations.java | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/autotune/analyzer/services/UpdateRecommendations.java b/src/main/java/com/autotune/analyzer/services/UpdateRecommendations.java index f88dcf7e4..5ade30fad 100644 --- a/src/main/java/com/autotune/analyzer/services/UpdateRecommendations.java +++ b/src/main/java/com/autotune/analyzer/services/UpdateRecommendations.java @@ -17,7 +17,6 @@ import com.autotune.analyzer.experiment.ExperimentInitiator; import com.autotune.analyzer.kruizeObject.KruizeObject; -import com.autotune.analyzer.recommendations.RecommendationConstants; import com.autotune.analyzer.serviceObjects.ContainerAPIObject; import com.autotune.analyzer.serviceObjects.Converters; import com.autotune.analyzer.serviceObjects.ListRecommendationsAPIObject; @@ -86,11 +85,6 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) Timestamp interval_end_time = null; Timestamp interval_start_time = null; - String intervalStartTimeStr = request.getParameter(KruizeConstants.JSONKeys.INTERVAL_START_TIME); - Timestamp interval_end_time = null; - Timestamp interval_start_time = null; - - // Check if experiment_name is provided if (experiment_name == null || experiment_name.isEmpty()) { sendErrorResponse(response, null, HttpServletResponse.SC_BAD_REQUEST, AnalyzerErrorConstants.APIErrors.UpdateRecommendationsAPI.EXPERIMENT_NAME_MANDATORY); @@ -101,20 +95,20 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) if (intervalEndTimeStr == null || intervalEndTimeStr.isEmpty()) { sendErrorResponse(response, null, HttpServletResponse.SC_BAD_REQUEST, AnalyzerErrorConstants.APIErrors.UpdateRecommendationsAPI.INTERVAL_END_TIME_MANDATORY); return; + } + if (!Utils.DateUtils.isAValidDate(KruizeConstants.DateFormats.STANDARD_JSON_DATE_FORMAT, intervalEndTimeStr)) { + sendErrorResponse( + response, + new Exception(AnalyzerErrorConstants.APIErrors.ListRecommendationsAPI.INVALID_TIMESTAMP_EXCPTN), + HttpServletResponse.SC_BAD_REQUEST, + String.format(AnalyzerErrorConstants.APIErrors.ListRecommendationsAPI.INVALID_TIMESTAMP_MSG, intervalEndTimeStr) + ); + return; } else { - if (!Utils.DateUtils.isAValidDate(KruizeConstants.DateFormats.STANDARD_JSON_DATE_FORMAT, intervalEndTimeStr)) { - sendErrorResponse( - response, - new Exception(AnalyzerErrorConstants.APIErrors.ListRecommendationsAPI.INVALID_TIMESTAMP_EXCPTN), - HttpServletResponse.SC_BAD_REQUEST, - String.format(AnalyzerErrorConstants.APIErrors.ListRecommendationsAPI.INVALID_TIMESTAMP_MSG, intervalEndTimeStr) - ); - return; - } else { - interval_end_time = Utils.DateUtils.getTimeStampFrom(KruizeConstants.DateFormats.STANDARD_JSON_DATE_FORMAT, intervalEndTimeStr); - } + interval_end_time = Utils.DateUtils.getTimeStampFrom(KruizeConstants.DateFormats.STANDARD_JSON_DATE_FORMAT, intervalEndTimeStr); } + // Check if interval_start_time is provided if (intervalStartTimeStr != null) { if (!Utils.DateUtils.isAValidDate(KruizeConstants.DateFormats.STANDARD_JSON_DATE_FORMAT, intervalStartTimeStr)) {