Merge "added annotations for api's"

3 files changed, 12 insertions, 9 deletions

diff --git a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/portal/controller/ExternalAppsRestfulController.java b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/portal/controller/ExternalAppsRestfulController.java
index 028ae68a..1ddc07da 100644
--- a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/portal/controller/ExternalAppsRestfulController.java
+++ b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/portal/controller/ExternalAppsRestfulController.java
@@ -9,7 +9,7 @@
  * under the Apache License, Version 2.0 (the "License");
  * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *             http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
@@ -63,6 +63,7 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 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.bind.annotation.RestController;
 
@@ -84,7 +85,7 @@ public class ExternalAppsRestfulController extends EPRestrictedRESTfulBaseContro
 	@Autowired
 	AdminRolesService adminRolesService;
 	
-	@RequestMapping(value={"/getFavorites"}, method = RequestMethod.GET,produces = "application/json")
+	@GetMapping(value={"/getFavorites"}, produces = "application/json")
 	public List<FavoritesFunctionalMenuItemJson> getFavoritesForUser(HttpServletRequest request, HttpServletResponse response) throws Exception {
 		String loginId 			= "";
 		String userAgent		= "";
@@ -109,7 +110,7 @@ public class ExternalAppsRestfulController extends EPRestrictedRESTfulBaseContro
 		return favorites;
 	}
 	
-	@RequestMapping(value={"/functionalMenuItemsForUser"}, method = RequestMethod.GET,produces = "application/json")
+	@GetMapping(value={"/functionalMenuItemsForUser"}, produces = "application/json")
 	public List<FunctionalMenuItem> getFunctionalMenuItemsForUser(HttpServletRequest request, HttpServletResponse response) throws Exception {
 		String loginId 			= "";
 		String userAgent 		= "";
diff --git a/ecomp-portal-widget-ms/widget-ms/src/main/java/org/onap/portalapp/widget/controller/DatabaseFileUploadController.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/onap/portalapp/widget/controller/DatabaseFileUploadController.java
index acdde23b..7d0600f6 100644
--- a/ecomp-portal-widget-ms/widget-ms/src/main/java/org/onap/portalapp/widget/controller/DatabaseFileUploadController.java
+++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/onap/portalapp/widget/controller/DatabaseFileUploadController.java
@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 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.bind.annotation.ResponseBody;
 
@@ -24,7 +25,7 @@ public class DatabaseFileUploadController {
 	private static final Logger logger = LoggerFactory.getLogger(DatabaseFileUploadController.class); 
 
 	@ResponseBody
-	@RequestMapping(value = "/microservices/markup/{widgetId}", method = RequestMethod.GET)
+	@GetMapping(value = "/microservices/markup/{widgetId}")
 	public String getWidgetMarkup(HttpServletRequest request, HttpServletResponse response, @PathVariable("widgetId") long widgetId){
 		String markup = null;
 		try{
@@ -37,7 +38,7 @@ public class DatabaseFileUploadController {
 	}
 
 	@ResponseBody
-	@RequestMapping(value = "/microservices/{widgetId}/controller.js", method = RequestMethod.GET)
+	@GetMapping(value = "/microservices/{widgetId}/controller.js")
 	public String getWidgetController(HttpServletRequest request, HttpServletResponse response, @PathVariable("widgetId") long widgetId){
 		String controller = null;
 		try{
@@ -50,7 +51,7 @@ public class DatabaseFileUploadController {
 	}
 
 	@ResponseBody
-	@RequestMapping(value = "/microservices/{widgetId}/framework.js", method = RequestMethod.GET)
+	@GetMapping(value = "/microservices/{widgetId}/framework.js")
 	public String getWidgetFramework(HttpServletRequest request, HttpServletResponse response,
 			@PathVariable("widgetId") long widgetId){
 		String framework = null;
@@ -64,7 +65,7 @@ public class DatabaseFileUploadController {
 	}
 	
 	@ResponseBody
-	@RequestMapping(value = "/microservices/{widgetId}/styles.css", method = RequestMethod.GET)
+	@GetMapping(value = "/microservices/{widgetId}/styles.css")
 	public String getWidgetCSS(HttpServletRequest request, HttpServletResponse response,
 			@PathVariable("widgetId") long widgetId){
 		String css = null;
diff --git a/ecomp-portal-widget-ms/widget-ms/src/main/java/org/onap/portalapp/widget/controller/HealthController.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/onap/portalapp/widget/controller/HealthController.java
index 6814f75a..8674d8ed 100644
--- a/ecomp-portal-widget-ms/widget-ms/src/main/java/org/onap/portalapp/widget/controller/HealthController.java
+++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/onap/portalapp/widget/controller/HealthController.java
@@ -4,13 +4,14 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 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.bind.annotation.RestController;
-
+ 
 @RestController
 public class HealthController {
 
-	@RequestMapping(value = { "/health" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = { "/health" }, produces = "application/json")
 	public HealthStatus getWidgetCatalog(HttpServletRequest request, HttpServletResponse response) {
 		return new HealthStatus("ok");
 	}