Merge "removed code smells"

5 files changed, 15 insertions, 15 deletions

diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CamundaCockpitController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CamundaCockpitController.java
index 4c32b964..f955e60a 100644
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CamundaCockpitController.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CamundaCockpitController.java
@@ -47,7 +47,7 @@ import org.onap.portalsdk.core.controller.RestrictedBaseController;
 import org.onap.portalsdk.core.util.SystemProperties;
 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.bind.annotation.ResponseBody;
 
 
@@ -63,7 +63,7 @@ public class CamundaCockpitController extends RestrictedBaseController {
 
 	private static final String CAMUNDA_COCKPIT_LINK = "camunda_cockpit_link";
 	@SuppressWarnings("rawtypes")
-	@RequestMapping(value = {"/get_camunda_cockpit_link" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = {"/get_camunda_cockpit_link" }, produces = "application/json")
 	@ResponseBody
 	public Map getCamundaCockpitLink(HttpServletRequest request,HttpServletResponse response) {
 		Map<String,String> map = new HashMap<>();
diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CollaborateListController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CollaborateListController.java
index e2515256..0757026d 100644
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CollaborateListController.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CollaborateListController.java
@@ -54,7 +54,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.servlet.ModelAndView;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -68,7 +68,7 @@ public class CollaborateListController  extends RestrictedBaseController {
 	@Autowired
 	private UserProfileService service;
 	
-	@RequestMapping(value = {"/collaborate_list" }, method = RequestMethod.GET)
+	@GetMapping(value = {"/collaborate_list" })
 	public ModelAndView ProfileSearch(HttpServletRequest request) {
 		Map<String, Object> model = new HashMap<>();
 		ObjectMapper mapper = new ObjectMapper();
@@ -85,7 +85,7 @@ public class CollaborateListController  extends RestrictedBaseController {
 		return new ModelAndView(getViewName(),"model", model);
 	}
 	
-	@RequestMapping(value = {"/get_collaborate_list" }, method = RequestMethod.GET)
+	@GetMapping(value = {"/get_collaborate_list" })
 	public void getCollaborateList(HttpServletRequest request,HttpServletResponse response) {
 		
 		ObjectMapper mapper = new ObjectMapper();
diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CollaborationController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CollaborationController.java
index 18cd6a6a..1addfa9a 100644
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CollaborationController.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CollaborationController.java
@@ -47,14 +47,14 @@ import org.onap.portalsdk.core.domain.User;
 import org.onap.portalsdk.core.web.support.UserUtils;
 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
 @RequestMapping("/")  
 public class CollaborationController extends RestrictedBaseController{
 	
-	@RequestMapping(value = {"/collaboration" }, method = RequestMethod.GET)
+	@GetMapping(value = {"/collaboration" })
 	public ModelAndView view(HttpServletRequest request) {
 		Map<String, Object> model = new HashMap<>();
 		User user = UserUtils.getUserSession(request);
@@ -62,7 +62,7 @@ public class CollaborationController extends RestrictedBaseController{
 		model.put("name",(user.getFirstName() + " " + (user.getLastName() != null? user.getLastName().substring(0,1): "" )));
 		return new ModelAndView(getViewName(),"model", model);
 	}
-	@RequestMapping(value = {"/openCollaboration" }, method = RequestMethod.GET)
+	@GetMapping(value = {"/openCollaboration" })
 	public ModelAndView openCollaboration(HttpServletRequest request) {
 		Map<String, Object> model = new HashMap<>();
 		User user = UserUtils.getUserSession(request);
diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/DS2SampleController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/DS2SampleController.java
index 58eda311..fcec97eb 100644
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/DS2SampleController.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/DS2SampleController.java
@@ -47,7 +47,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;
 
 
@@ -63,7 +63,7 @@ public class DS2SampleController extends UnRestrictedBaseController {
 	@Autowired
 	ProfileService service;
 
-	@RequestMapping(value = { "/ds2_sample" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/ds2_sample" })
 	public ModelAndView ProfileSearch(HttpServletRequest request) {
 		Map<String, Object> model = new HashMap<>();
 		return new ModelAndView("ds2_sample", "model", model);
diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/ElasticSearchController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/ElasticSearchController.java
index 37c4eb77..af40c45b 100644
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/ElasticSearchController.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/ElasticSearchController.java
@@ -47,7 +47,7 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PathVariable;
 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.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -66,17 +66,17 @@ import io.searchbox.params.Parameters;
 @RestController
 public class ElasticSearchController extends RestrictedBaseController{
 	 
-	@RequestMapping(value = {"/es_search_demo" }, method = RequestMethod.GET)
+	@GetMapping(value = {"/es_search_demo" })
 	public ModelAndView search() {
 		return new ModelAndView("es_search_demo");	
 	}
 	
-	@RequestMapping(value = {"/es_suggest_demo" }, method = RequestMethod.GET)
+	@GetMapping(value = {"/es_suggest_demo" })
 	public ModelAndView suggest() {
 		return new ModelAndView("es_suggest_demo");	
 	}
 	
-	@RequestMapping(value="/es_suggest/{task}",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)  	
+	@GetMapping(value="/es_suggest/{task}", produces = MediaType.APPLICATION_JSON_VALUE)  	
 	public ResponseEntity<Result> doSuggest(@PathVariable("task") String task) throws IOException {
 		JSONObject obj = new JSONObject(task);
 		String searchTerm = obj.getString("data");
@@ -108,7 +108,7 @@ public class ElasticSearchController extends RestrictedBaseController{
 		return new ResponseEntity<>(new Result(result.getJsonObject().toString()),HttpStatus.OK);
 	}
 	
-	@RequestMapping(value="/es_search/{task}",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	@GetMapping(value="/es_search/{task}", produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<Result> doSearch(@PathVariable("task") String task) throws IOException {
 		JSONObject obj = new JSONObject(task);
 		String searchTerm = obj.getString("data");