added proper annotations

Issue-ID: PORTAL-865
Change-Id: Icca96a44b43afa494d05231db5bc11f80c32469c
Signed-off-by: Rupinder <rupinsi1@in.ibm.com>

2 files changed, 51 insertions, 47 deletions

diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/web/RaptorController.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/web/RaptorController.java
index 8eda540d..a044a9c4 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/web/RaptorController.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/web/RaptorController.java
@@ -58,6 +58,7 @@ import org.onap.portalsdk.core.controller.RestrictedBaseController;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -73,30 +74,30 @@ public class RaptorController extends RestrictedBaseController {
     private static final String IS_EMBEDDED = "isEmbedded";
     private static final String ACTION_NOT_FOUND = "Action not found";
 
-    @RequestMapping(value = { "/report" }, method = RequestMethod.GET)
+    @GetMapping(value = { "/report" })
     public ModelAndView report(HttpServletRequest request) {
         request.getSession().setAttribute(IS_EMBEDDED, false);
         return new ModelAndView("report");
     }
 
-    @RequestMapping(value = { "/reportDS1" }, method = RequestMethod.GET)
+    @GetMapping(value = { "/reportDS1" })
     public ModelAndView reportDS1(HttpServletRequest request) {
         request.getSession().setAttribute(IS_EMBEDDED, false);
         return new ModelAndView("reportDS1");
     }
 
-    @RequestMapping(value = { "/report_embedded" }, method = RequestMethod.GET)
+    @GetMapping(value = { "/report_embedded" })
     public ModelAndView reportEmbedded(HttpServletRequest request) {
         request.getSession().setAttribute(IS_EMBEDDED, true);
         return new ModelAndView("report_embedded");
     }
 
-    @RequestMapping(value = { "/report_sample" }, method = RequestMethod.GET)
+    @GetMapping(value = { "/report_sample" })
     public ModelAndView reportSample(HttpServletRequest request) {
         return new ModelAndView("report_sample");
     }
 
-    @RequestMapping(value = { "/report_import.htm" }, method = RequestMethod.GET)
+    @GetMapping(value = { "/report_import.htm" })
     public ModelAndView reportImport(HttpServletRequest request) throws IOException {
         String viewName = "report_import";
         Action action = null;
@@ -119,7 +120,7 @@ public class RaptorController extends RestrictedBaseController {
         return new ModelAndView(viewName, "model", null);
     }
 
-    @RequestMapping(value = { "/report_wizard.htm" }, method = { RequestMethod.POST, RequestMethod.GET })
+    @GetMapping(value = { "/report_wizard.htm" })
     public ModelAndView reportWizard(HttpServletRequest request, HttpServletResponse response) throws IOException {
         String viewName = "";
         String actionKey = nvl(request.getParameter(AppConstants.RI_ACTION), request.getParameter("action"));
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/web/RaptorControllerAsync.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/web/RaptorControllerAsync.java
index ae9d39a1..a39d371d 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/web/RaptorControllerAsync.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/web/RaptorControllerAsync.java
@@ -120,6 +120,9 @@ import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
@@ -137,7 +140,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 
 	private String viewName;
 
-	@RequestMapping(value = { "/raptor.htm" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/raptor.htm" })
 	public void RaptorSearch(HttpServletRequest request, HttpServletResponse response)
 			throws IOException, RaptorException {
 
@@ -301,7 +304,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 		}
 	}
 
-	@RequestMapping(value = "/report/wizard/drill_down_param/{parameter}", method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = "/report/wizard/drill_down_param/{parameter}", produces = "application/json")
 	public @ResponseBody List<DrillDownParamDef> getDrillDownParamDef (@PathVariable("parameter") String parameter, HttpServletRequest request, HttpServletResponse response)
 	{
 		List<DrillDownParamDef> list = new ArrayList<>();
@@ -315,7 +318,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 		return list;
 	}
 	
-	@RequestMapping(value = "/report/wizard/list_columns", method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = "/report/wizard/list_columns", produces = "application/json")
 	public @ResponseBody ArrayList<ColumnJSON> listColumns(HttpServletRequest request, HttpServletResponse response)
 	{
 		ReportDefinition rdef = (ReportDefinition) request.getSession().getAttribute(AppConstants.SI_REPORT_DEFINITION);
@@ -332,7 +335,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 		return listJSON;
 	}
 
-	@RequestMapping(value = "/report/wizard/list_drilldown_reports", method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = "/report/wizard/list_drilldown_reports", produces = "application/json")
 	public @ResponseBody ArrayList<ColumnJSON> list_drilldown_reports(HttpServletRequest request,
 			HttpServletResponse response) throws RaptorException {
 		ReportDefinition rdef = (ReportDefinition) request.getSession().getAttribute(AppConstants.SI_REPORT_DEFINITION);
@@ -380,7 +383,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 		return listJSON;
 	}
 
-	@RequestMapping(value = "/report/wizard/list_formfields", method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = "/report/wizard/list_formfields", produces = "application/json")
 	public @ResponseBody ArrayList<SearchFieldJSON> listFormFields(HttpServletRequest request,
 			HttpServletResponse response) {
 		ReportDefinition rdef = (ReportDefinition) request.getSession().getAttribute(AppConstants.SI_REPORT_DEFINITION);
@@ -402,7 +405,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 		return listJSON;
 	}
 
-	@RequestMapping(value = "/report/wizard/list_child_report_col/{reportID}", method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = "/report/wizard/list_child_report_col/{reportID}", produces = "application/json")
 	public @ResponseBody ArrayList<ColumnJSON> listChildReportCols(@PathVariable("reportID") String reportID,
 			HttpServletRequest request, HttpServletResponse response) throws RaptorException {
 		ReportRuntime ddRr = (new ReportHandler()).loadReportRuntime(request, reportID, false);
@@ -420,7 +423,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 		return listJSON;
 	}
 
-	@RequestMapping(value = "/report/wizard/list_child_report_ff/{reportID}", method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = "/report/wizard/list_child_report_ff/{reportID}", produces = "application/json")
 	public @ResponseBody ArrayList<SearchFieldJSON> listChildReportFormFields(@PathVariable("reportID") String reportID,
 			HttpServletRequest request, HttpServletResponse response) throws RaptorException {
 		ReportRuntime ddRr = (new ReportHandler()).loadReportRuntime(request, reportID, false);
@@ -442,7 +445,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 		return listJSON;
 	}
 
-	@RequestMapping(value = "report/wizard/copy_report/{reportID}", method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = "report/wizard/copy_report/{reportID}", produces = "application/json")
 	public @ResponseBody MessageJSON copyReport(@PathVariable("reportID") String reportID, HttpServletRequest request,
 			HttpServletResponse response){
 		MessageJSON messageJSON = new MessageJSON();
@@ -469,7 +472,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 		return messageJSON;
 	}
 
-	@RequestMapping(value = "report/wizard/import_report", method = RequestMethod.POST, consumes = "application/json")
+	@PostMapping(value = "report/wizard/import_report", consumes = "application/json")
 	public @ResponseBody MessageJSON importReport(@RequestBody ImportJSON importJSON, HttpServletRequest request,
 			HttpServletResponse response) {
 		MessageJSON messageJSON = new MessageJSON();
@@ -500,7 +503,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 
 	}
 
-	@RequestMapping(value = "report/wizard/get_formfield_groups_data/{id}", method = RequestMethod.GET)
+	@GetMapping(value = "report/wizard/get_formfield_groups_data/{id}")
 	public @ResponseBody FormFieldGroupsJSON getFFGroupsData(@PathVariable Map<String, String> pathVariables,
 			HttpServletRequest request, HttpServletResponse response) throws IOException, RaptorException {
 
@@ -531,7 +534,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 		return formFieldGroupsJSON;
 	}
 	
-	@RequestMapping(value = "report/wizard/clearSession", method = RequestMethod.GET)
+	@GetMapping(value = "report/wizard/clearSession")
 	public @ResponseBody MessageJSON clearSession(HttpServletRequest request, HttpServletResponse response) {		
 		MessageJSON messageJSON = new MessageJSON();
 		removeVariablesFromSession(request);
@@ -542,7 +545,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 	}
 	
 	
-	@RequestMapping(value = "report/wizard/save_formfield_groups_data", method = RequestMethod.POST)
+	@PostMapping(value = "report/wizard/save_formfield_groups_data")
 	public @ResponseBody MessageJSON saveFFGroupsData(@RequestBody FormFieldGroupsJSON formFieldGroupsJSON,
 			HttpServletRequest request, HttpServletResponse response) throws IOException, RaptorException {
 
@@ -577,7 +580,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 		return messageJSON;
 	}
 
-	@RequestMapping(value = "report/wizard/save_formfield_tab_data", method = RequestMethod.POST)
+	@PostMapping(value = "report/wizard/save_formfield_tab_data")
 	public @ResponseBody MessageJSON saveFFTabWiseData(@RequestBody FormEditJSON formEditJSON,
 			HttpServletRequest request, HttpServletResponse response) {
 		ReportDefinition rdef = null;
@@ -663,7 +666,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 		return messageJSON;
 	}
 	
-	@RequestMapping(value = "report/wizard/add_formfield_tab_data", method = RequestMethod.POST)
+	@PostMapping(value = "report/wizard/add_formfield_tab_data")
 	public @ResponseBody MessageJSON addFFTabWiseData(@RequestBody FormEditJSON formEditJSON,
 			HttpServletRequest request, HttpServletResponse response) {
 		ReportDefinition rdef;
@@ -720,7 +723,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 		return messageJSON;
 	}
 
-	@RequestMapping(value = "report/wizard/save_col_tab_data", method = RequestMethod.POST)
+	@PostMapping(value = "report/wizard/save_col_tab_data")
 	public @ResponseBody MessageJSON saveColTabWiseData(@RequestBody ColumnEditJSON columnEditJSON,
 			HttpServletRequest request, HttpServletResponse response) {
 		ReportDefinition rdef;
@@ -785,7 +788,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 		return messageJSON;
 	}
 
-	@RequestMapping(value = "report/wizard/save_def_tab_data/{id}", method = RequestMethod.POST)
+	@PostMapping(value = "report/wizard/save_def_tab_data/{id}")
 	public @ResponseBody MessageJSON saveDefTabWiseData(@PathVariable("id") String id,
 			@RequestBody DefinitionJSON definitionJSON, HttpServletRequest request, HttpServletResponse response)
 	{
@@ -983,8 +986,8 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 		return messageJSON;
 	}
 
-	@RequestMapping(value = { "/report/wizard/retrieve_form_tab_wise_data/{id}",
-			"/report/wizard/retrieve_form_tab_wise_data/{id}/{action}" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/report/wizard/retrieve_form_tab_wise_data/{id}",
+			"/report/wizard/retrieve_form_tab_wise_data/{id}/{action}" })
 	public @ResponseBody FormEditJSON retrieveFormTabWiseData(@PathVariable Map<String, String> pathVariables,
 			HttpServletRequest request, HttpServletResponse response) {
 		ReportDefinition rdef;
@@ -1072,7 +1075,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 		return wizardJSON;
 	}
 
-	@RequestMapping(value = { "/report/wizard/retrieve_col_tab_wise_data/{id}" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/report/wizard/retrieve_col_tab_wise_data/{id}" })
 	public @ResponseBody ColumnEditJSON retrieveColTabWiseData(@PathVariable Map<String, String> pathVariables,
 			HttpServletRequest request, HttpServletResponse response) {
 		ReportDefinition rdef;
@@ -1137,8 +1140,8 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 		return wizardJSON;
 	}
 
-	@RequestMapping(value = { "/report/wizard/retrieve_sql_tab_wise_data/{id}",
-			"/report/wizard/retrieve_sql_tab_wise_data/" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/report/wizard/retrieve_sql_tab_wise_data/{id}",
+			"/report/wizard/retrieve_sql_tab_wise_data/" })
 	public @ResponseBody QueryJSON retrieveSqlTabWiseData(@PathVariable Map<String, String> pathVariables,
 			HttpServletRequest request, HttpServletResponse response) throws RaptorException {
 		ReportDefinition rdef = null;
@@ -1181,7 +1184,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 		return wizardJSON;
 	}
 
-	@RequestMapping(value = { "/report/wizard/retrieveTotalForTheColList" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/report/wizard/retrieveTotalForTheColList" })
 	public @ResponseBody List<IdNameValue> getTotalForTheCol(HttpServletRequest request)
 	{
 	    IdNameList idNameList = AppConstants.TOTAL_FUNCTIONS;
@@ -1192,7 +1195,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 		return list;
 	}
 	
-	@RequestMapping(value = { "/report/wizard/security/retrieveReportUserList" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/report/wizard/security/retrieveReportUserList" })
 	public @ResponseBody List<SecurityEntry> getReportUserList(HttpServletRequest request)
 			throws RaptorException {
 			List<SecurityEntry> reportUserList = new ArrayList<>();
@@ -1205,7 +1208,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 			return reportUserList;
 	};
 	
-	@RequestMapping(value = { "/report/wizard/security/retrieveReportRoleList" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/report/wizard/security/retrieveReportRoleList" })
 	public @ResponseBody List<IdNameValue> getReportRoleList(HttpServletRequest request)
 			throws RaptorException {
 			List<IdNameValue> reportRoleList = new ArrayList<>();
@@ -1219,7 +1222,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 			return reportRoleList;
 		};
 		
-		@RequestMapping(value = { "/report/wizard/security/retrieveReportUserList_query" }, method = RequestMethod.GET)
+		@GetMapping(value = { "/report/wizard/security/retrieveReportUserList_query" })
 		public @ResponseBody List<Map<String, String>> getReportUserListQuery(HttpServletRequest request)
 		{
 				List<Map<String, String>> reportUserList = new ArrayList();
@@ -1242,7 +1245,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 
 
 
-			@RequestMapping(value = "/report/security/addReportUser", method = RequestMethod.POST)
+			@PostMapping(value = "/report/security/addReportUser")
 			public @ResponseBody Map<String,String> addSelectedReportUser(
 					@RequestBody String userIdToAdd, HttpServletRequest request, HttpServletResponse response)
 			{
@@ -1263,7 +1266,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 					}				
 				}
 
-			@RequestMapping(value = "/report/security/removeReportUser", method = RequestMethod.POST)
+			@PostMapping(value = "/report/security/removeReportUser")
 			public @ResponseBody Map<String,String> removeSelectedReportUser(
 					@RequestBody String userIdToRemove, HttpServletRequest request, HttpServletResponse response)
 			{
@@ -1285,7 +1288,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 						}				
 					}
 			
-			@RequestMapping(value = "/report/security/addReportRole", method = RequestMethod.POST)
+			@PostMapping(value = "/report/security/addReportRole")
 			public @ResponseBody Map<String,String> addSelectedReportRole(
 					@RequestBody String roleIdToAdd, HttpServletRequest request, HttpServletResponse response) {
 					Map<String, String> JsonResponse = new HashMap<>();
@@ -1305,7 +1308,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 					}				
 				}
 
-			@RequestMapping(value = "/report/security/removeReportRole", method = RequestMethod.POST)
+			@PostMapping(value = "/report/security/removeReportRole")
 			public @ResponseBody Map<String,String> removeSelectedReportRole(
 					@RequestBody String roleIdToRemove, HttpServletRequest request, HttpServletResponse response)
 			{
@@ -1326,7 +1329,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 					}				
 				}			
 
-			@RequestMapping(value = "/report/security/updateReportSecurityInfo", method = RequestMethod.POST)
+			@PostMapping(value = "/report/security/updateReportSecurityInfo")
 			public @ResponseBody Map<String,String> updateReportSecurityInfo(
 					@RequestBody Map<String,String> securityInfo, HttpServletRequest request, HttpServletResponse response)
 			{
@@ -1350,7 +1353,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 					}				
 				}
 
-			@RequestMapping(value = "/report/security/toggleUserEditAccess/{userID}", method = RequestMethod.POST)
+			@PostMapping(value = "/report/security/toggleUserEditAccess/{userID}")
 			public @ResponseBody Map<String,String> toggleUserEditAccess(
 					@PathVariable("userID") String userId,
 					@RequestBody String readOnly, HttpServletRequest request, HttpServletResponse response)
@@ -1377,7 +1380,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 					}				
 				};			
 
-				@RequestMapping(value = "/report/security/toggleRoleEditAccess/{roleID}", method = RequestMethod.POST)
+				@PostMapping(value = "/report/security/toggleRoleEditAccess/{roleID}")
 				public @ResponseBody Map<String,String> toggleRoleEditAccess(
 						@PathVariable("roleID") String roleId,
 						@RequestBody String readOnly, HttpServletRequest request, HttpServletResponse response)
@@ -1404,7 +1407,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 						}				
 					};			
 				
-	@RequestMapping(value = { "/report/wizard/security/retrieveReportOwner" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/report/wizard/security/retrieveReportOwner" })
 	public @ResponseBody List<IdNameValue> getReportOwnerInList(HttpServletRequest request)
 			throws RaptorException {
 		ReportDefinition rdef = (ReportDefinition) request.getSession().getAttribute(AppConstants.SI_REPORT_DEFINITION);
@@ -1443,7 +1446,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 	}
 
 	
-	@RequestMapping(value = { "/report/wizard/security/getReportSecurityInfo" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/report/wizard/security/getReportSecurityInfo" })
 	public @ResponseBody Map<String,String> getReportSecurityInfo(HttpServletRequest request)
 	 {
 		Map<String, String> securityInfoMap = new HashMap<>();
@@ -1465,7 +1468,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 		return securityInfoMap;
 	}	
 	
-	@RequestMapping(value = { "/report/wizard/security/getReportSecurityUsers" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/report/wizard/security/getReportSecurityUsers" })
 	public @ResponseBody List<SecurityEntry> getReportSecurityUsers(HttpServletRequest request)
 			throws RaptorException {
 		
@@ -1484,7 +1487,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 	}		
 	
 	
-	@RequestMapping(value = { "/report/wizard/security/getReportSecurityRoles" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/report/wizard/security/getReportSecurityRoles" })
 	public @ResponseBody List<SecurityEntry> getReportSecurityRoles(HttpServletRequest request)
 			throws RaptorException {
 		
@@ -1501,8 +1504,8 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 	}		
 	
 	
-	@RequestMapping(value = { "/report/wizard/retrieve_def_tab_wise_data/{id}",
-			"/report/wizard/retrieve_def_tab_wise_data/{id}/{detailId}" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/report/wizard/retrieve_def_tab_wise_data/{id}",
+			"/report/wizard/retrieve_def_tab_wise_data/{id}/{detailId}" })
 	public @ResponseBody DefinitionJSON retrieveDefTabWiseData(@PathVariable Map<String, String> pathVariables,
 			HttpServletRequest request, HttpServletResponse response) throws RaptorException {
 		ReportDefinition rdef;
@@ -1662,7 +1665,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 
 	}
 
-	@RequestMapping(value = "/report/wizard/retrieve_data/{validate}", method = RequestMethod.POST)
+	@PostMapping(value = "/report/wizard/retrieve_data/{validate}")
 	public @ResponseBody RaptorResponse retrieveDataForGivenQuery(@PathVariable("validate") boolean validate,
 			@RequestBody QueryJSON queryJSON, HttpServletRequest request, HttpServletResponse response)
 			throws RaptorException {
@@ -1859,7 +1862,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 	}
 	
 	
-	@RequestMapping(value = "/report/wizard/get_report_log/{reportID}", method = RequestMethod.GET)
+	@GetMapping(value = "/report/wizard/get_report_log/{reportID}")
 	public @ResponseBody ArrayList<ReportLogEntry> getLogs(@PathVariable("reportID") String reportId, HttpServletRequest request,
 			HttpServletResponse ReportLogEntry) {
 		ArrayList<ReportLogEntry> arrayList = new ArrayList<>();
@@ -1875,7 +1878,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
 		return arrayList;
 	}
 
-	@RequestMapping(value = "save_chart", method = RequestMethod.POST)
+	@PostMapping(value = "save_chart")
 	public void reportChartReceive(@RequestBody ChartJSON chartJSON, HttpServletRequest request,
 			HttpServletResponse response) {
 		//ReportRuntime reportRuntime;