1 files changed, 22 insertions, 3 deletions

diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/ProfileSearchController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/ProfileSearchController.java
index ff80d413..b58b6146 100644
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/ProfileSearchController.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/ProfileSearchController.java
@@ -66,6 +66,7 @@ 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;
@@ -90,7 +91,7 @@ public class ProfileSearchController extends RestrictedBaseController {
 	@Autowired
 	private LoginStrategy loginStrategy;
 
-	@RequestMapping(value = { "/profile_search" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/profile_search" })
 	public ModelAndView profileSearch(HttpServletRequest request) {
 		Map<String, Object> model = new HashMap<>();
 		ObjectMapper mapper = new ObjectMapper();
@@ -107,7 +108,7 @@ public class ProfileSearchController extends RestrictedBaseController {
 	}
 
 
-	@RequestMapping(value = { "/get_user_pagination" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/get_user_pagination" })
 	public void getUserPagination(HttpServletRequest request, HttpServletResponse response) {
 		Map<String, Object> model = new HashMap<>();
 		ObjectMapper mapper = new ObjectMapper();
@@ -139,6 +140,24 @@ public class ProfileSearchController extends RestrictedBaseController {
 			logger.error(EELFLoggerDelegate.applicationLogger, "getUserPagination failed", e);
 		}
 	}
+	
+	@RequestMapping(value = { "/get_all_users" }, method = RequestMethod.GET)
+	public void getAllUsers(HttpServletRequest request, HttpServletResponse response) {
+		Map<String, Object> model = new HashMap<>();
+		ObjectMapper mapper = new ObjectMapper();
+		logger.info(EELFLoggerDelegate.applicationLogger, "Initiating get_all_users in ProfileSearchController");
+		List<User> profileList = null;
+		try {
+			profileList = service.listAllUsers();
+			model.put("profileList", mapper.writeValueAsString(profileList));
+			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
+			JSONObject j = new JSONObject(msg);
+			response.setContentType(APPLICATION_JSON);
+			response.getWriter().write(j.toString());
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.applicationLogger, "getAllUsers failed", e);
+		}
+	}
 
 	@SuppressWarnings("unchecked")
 	private Map<String, Object> setDashboardData(HttpServletRequest request)
@@ -161,7 +180,7 @@ public class ProfileSearchController extends RestrictedBaseController {
 		return model;
 	}
 
-	@RequestMapping(value = { "/profile/toggleProfileActive" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/profile/toggleProfileActive" })
 	public void toggleProfileActive(HttpServletRequest request, HttpServletResponse response) throws IOException {
 		try {
 			logger.info(EELFLoggerDelegate.applicationLogger,