Merge "wrote appropriate annotations"

5 files changed, 12 insertions, 12 deletions

diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/SingleSignOnController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/SingleSignOnController.java
index 83962c63..95ac28d8 100644
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/SingleSignOnController.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/SingleSignOnController.java
@@ -70,7 +70,7 @@ import org.onap.portalsdk.core.web.support.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.util.WebUtils;
@@ -116,7 +116,7 @@ public class SingleSignOnController extends UnRestrictedBaseController {
 	 * @return Redirect to an appropriate address
 	 * @throws Exception
 	 */
-	@RequestMapping(value = { "/single_signon.htm" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/single_signon.htm" })
 	public ModelAndView singleSignOnLogin(HttpServletRequest request) throws Exception {
 
 		Map<String, String> model = new HashMap<>();
diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/UsageListController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/UsageListController.java
index fabc06bf..00b8d796 100644
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/UsageListController.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/UsageListController.java
@@ -56,7 +56,7 @@ import org.onap.portalsdk.core.util.UsageUtils;
 import org.onap.portalsdk.core.web.support.JsonMessage;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.servlet.ModelAndView;
 
 @Controller
@@ -93,7 +93,7 @@ public class UsageListController extends RestrictedBaseController {
   }
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })
-	@RequestMapping(value = { "/usage_list" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/usage_list" })
 	public ModelAndView usageList(HttpServletRequest request) {
 		Map<String, Object> model = new HashMap<>();
 
@@ -117,7 +117,7 @@ public class UsageListController extends RestrictedBaseController {
 	}
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })
-	@RequestMapping(value = { "/get_usage_list" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/get_usage_list" })
 	public void getUsageList(HttpServletRequest request, HttpServletResponse response) {
 
 		HttpSession httpSession = request.getSession();
@@ -144,7 +144,7 @@ public class UsageListController extends RestrictedBaseController {
 	}
 
 	@SuppressWarnings("rawtypes")
-	@RequestMapping(value = { "/usage_list/removeSession" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/usage_list/removeSession" })
 	public void removeSession(HttpServletRequest request, HttpServletResponse response) throws IOException {
 		HashMap activeUsers = (HashMap) request.getSession().getServletContext().getAttribute(ACTIVE_USERS);
 		UserRowBean data = new UserRowBean();
diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/UserProfileController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/UserProfileController.java
index 5067be1e..c637719d 100644
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/UserProfileController.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/UserProfileController.java
@@ -49,7 +49,7 @@ import org.onap.portalsdk.core.service.ProfileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -68,7 +68,7 @@ public class UserProfileController extends RestrictedBaseController {
 	@Autowired
 	private ProfileService service;
 
-	@RequestMapping(value = { "/user_profile" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/user_profile" })
 	public ModelAndView userProfile() throws IOException {
 		Map<String, Object> model = new HashMap<>();
 		ObjectMapper mapper = new ObjectMapper();
diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/WelcomeController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/WelcomeController.java
index 7193f6bb..ce6b8ef1 100644
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/WelcomeController.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/WelcomeController.java
@@ -40,7 +40,7 @@ package org.onap.portalapp.controller.core;
 import org.onap.portalsdk.core.controller.RestrictedBaseController;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.servlet.ModelAndView;
 
 /**
@@ -51,7 +51,7 @@ import org.springframework.web.servlet.ModelAndView;
 @Controller
 @RequestMapping("/")
 public class WelcomeController extends RestrictedBaseController {
-	@RequestMapping(value = { "/welcome" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/welcome" })
 	public ModelAndView welcome() {
 		final String defaultViewName = null;
 		return new ModelAndView(defaultViewName);
diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/AngularSinglePageController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/AngularSinglePageController.java
index 96b602c3..98f1db84 100644
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/AngularSinglePageController.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/AngularSinglePageController.java
@@ -45,7 +45,7 @@ import javax.servlet.http.HttpServletRequest;
 import org.onap.portalsdk.core.controller.RestrictedBaseController;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.servlet.ModelAndView;
 
 /**
@@ -57,7 +57,7 @@ import org.springframework.web.servlet.ModelAndView;
 @RequestMapping("/")
 public class AngularSinglePageController extends RestrictedBaseController {
 
-	@RequestMapping(value = { "/singlePageSample" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/singlePageSample" })
 	public ModelAndView view(HttpServletRequest request) {
 		Map<String, Object> model = new HashMap<>();
 		return new ModelAndView("single_page_sample", "model", model);