X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fcontroller%2FAppContactUsController.java;h=0bf75fbe04678641b7e4f3e15c4176643863807d;hb=9d0a5f83f7454941d5c9b74dbc5601c7a52945b1;hp=b5876af877207325182baa5cfce9b565cc1de551;hpb=b90e14ca265fbecf60a8723dfdc603a28cca3e69;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/AppContactUsController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/AppContactUsController.java
index b5876af8..0bf75fbe 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/AppContactUsController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/AppContactUsController.java
@@ -33,7 +33,7 @@
  *
  * ============LICENSE_END============================================
  *
- * 
+ *
  */
 package org.onap.portalapp.portal.controller;
 
@@ -61,8 +61,9 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
 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.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 
 @RestController
 @RequestMapping("/portalApi/contactus")
@@ -94,7 +95,7 @@ public class AppContactUsController extends EPRestrictedBaseController {
 	 * @param request HttpServletRequest
 	 * @return PortalRestResponse
 	 */
-	@RequestMapping(value = "/feedback", method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = "/feedback", produces = "application/json")
 	public PortalRestResponse<String> getPortalDetails(HttpServletRequest request) {
 		PortalRestResponse<String> portalRestResponse;
 		try {
@@ -110,6 +111,7 @@ public class AppContactUsController extends EPRestrictedBaseController {
 			portalRestResponse = new PortalRestResponse<>(PortalRestStatusEnum.OK, SUCCESS,
 				contactUsPortalResponse);
 		} catch (Exception e) {
+            logger.error(EELFLoggerDelegate.errorLogger, "getPortalDetails failed", e);
 			return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, FAILURE, e.getMessage());
 		}
 		return portalRestResponse;
@@ -122,7 +124,7 @@ public class AppContactUsController extends EPRestrictedBaseController {
 	 * @param request HttpServletRequest
 	 * @return PortalRestResponse<List<AppContactUsItem>>
 	 */
-	@RequestMapping(value = "/list", method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = "/list", produces = "application/json")
 	public PortalRestResponse<List<AppContactUsItem>> getAppContactUsList(HttpServletRequest request) {
 		PortalRestResponse<List<AppContactUsItem>> portalRestResponse;
 		try {
@@ -144,7 +146,7 @@ public class AppContactUsController extends EPRestrictedBaseController {
 	 * @param request HttpServletRequest
 	 * @return PortalRestResponse<List<AppContactUsItem>>
 	 */
-	@RequestMapping(value = "/allapps", method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = "/allapps", produces = "application/json")
 	public PortalRestResponse<List<AppContactUsItem>> getAppsAndContacts(HttpServletRequest request) {
 		PortalRestResponse<List<AppContactUsItem>> portalRestResponse;
 		try {
@@ -162,11 +164,11 @@ public class AppContactUsController extends EPRestrictedBaseController {
 	/**
 	 * Answers a list of objects with category-application-function details. Not
 	 * all applications participate in the functional menu.
-	 * 
+	 *
 	 * @param request HttpServletRequest
 	 * @return PortalRestResponse<List<AppCategoryFunctionsItem>>
 	 */
-	@RequestMapping(value = "/functions", method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = "/functions", produces = "application/json")
 	public PortalRestResponse<List<AppCategoryFunctionsItem>> getAppCategoryFunctions(HttpServletRequest request) {
 		PortalRestResponse<List<AppCategoryFunctionsItem>> portalRestResponse;
 		try {
@@ -185,11 +187,11 @@ public class AppContactUsController extends EPRestrictedBaseController {
 
 	/**
 	 * Accepts a new application's contact us details.
-	 * 
+	 *
 	 * @param contactUs AppContactUsItem
 	 * @return PortalRestResponse<String>
 	 */
-	@RequestMapping(value = "/save", method = RequestMethod.POST, produces = "application/json")
+	@PostMapping(value = "/save", produces = "application/json")
 	public PortalRestResponse<String> save(@RequestBody AppContactUsItem contactUs) {
 
 		if (contactUs == null || contactUs.getAppName() == null) {
@@ -209,7 +211,7 @@ public class AppContactUsController extends EPRestrictedBaseController {
 		return new PortalRestResponse<>(PortalRestStatusEnum.OK, saveAppContactUs, "");
 	}
 
-	@RequestMapping(value = "/saveAll", method = RequestMethod.POST, produces = "application/json")
+	@PostMapping(value = "/saveAll", produces = "application/json")
 	public PortalRestResponse<String> save(@RequestBody List<AppContactUsItem> contactUsList) {
 
 		if (contactUsList == null) {
@@ -232,11 +234,11 @@ public class AppContactUsController extends EPRestrictedBaseController {
 	/**
 	 * Deletes the specified application's contact-us details entry from the
 	 * table.
-	 * 
+	 *
 	 * @param id app ID
 	 * @return PortalRestResponse<String>
 	 */
-	@RequestMapping(value = "/delete/{appid}", method = RequestMethod.POST, produces = "application/json")
+	@PostMapping(value = "/delete/{appid}", produces = "application/json")
 	public PortalRestResponse<String> delete(@PathVariable("appid") Long id) {
 
 		String saveAppContactUs = FAILURE;