X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fcontroller%2FAdminController.java;h=86a77009d582428ee1f079caf96b4c9fb92fbb96;hb=93a44cb851a49c923126f32016646860d104075c;hp=ed4837d8adba98d3416c48b7dd9695658aaa1024;hpb=1fde0c3b93c9cf75b9e48382f298f644b03fa249;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AdminController.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AdminController.java
index ed4837d8..86a77009 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AdminController.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AdminController.java
@@ -28,8 +28,8 @@ import org.oransc.ric.portal.dashboard.model.SuccessTransport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import io.swagger.annotations.ApiOperation;
@@ -38,25 +38,34 @@ import io.swagger.annotations.ApiOperation;
  * Answers REST requests for admin services like version, health etc.
  */
 @RestController
-@RequestMapping(value = DashboardConstants.ENDPOINT_PREFIX + "/admin", produces = MediaType.APPLICATION_JSON_VALUE)
+@RequestMapping(value = AdminController.CONTROLLER_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
 public class AdminController {
 
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
+	// Publish paths in constants so tests are easy to write
+	public static final String CONTROLLER_PATH = DashboardConstants.ENDPOINT_PREFIX + "/admin";
+	public static final String USER_METHOD = "user";
+	public static final String HEALTH_METHOD = "health";
+	public static final String VERSION_METHOD = DashboardConstants.VERSION_METHOD;
+
 	private final DashboardUser[] users;
 
+	private static final String ACTIVE = "Active";
+	private static final String INACTIVE = "Inactive";
+
 	public AdminController() {
 		// Mock data
 		users = new DashboardUser[] { //
-				new DashboardUser(1, "John", "Doe", "Active"), //
-				new DashboardUser(2, "Alice", "Nolan", "Active"), //
-				new DashboardUser(3, "Pierce", "King", "Inactive"), //
-				new DashboardUser(4, "Paul", "Smith", "Inactive"), //
-				new DashboardUser(5, "Jack", "Reacher", "Active") };
+				new DashboardUser(1, "John", "Doe", ACTIVE), //
+				new DashboardUser(2, "Alice", "Nolan", ACTIVE), //
+				new DashboardUser(3, "Pierce", "King", INACTIVE), //
+				new DashboardUser(4, "Paul", "Smith", INACTIVE), //
+				new DashboardUser(5, "Jack", "Reacher", ACTIVE) };
 	}
 
 	@ApiOperation(value = "Gets the Dashboard MANIFEST.MF property Implementation-Version.", response = SuccessTransport.class)
-	@RequestMapping(value = DashboardConstants.VERSION_PATH, method = RequestMethod.GET)
+	@GetMapping(VERSION_METHOD)
 	public SuccessTransport getVersion() {
 		logger.debug("getVersion");
 		return new SuccessTransport(200,
@@ -64,14 +73,14 @@ public class AdminController {
 	}
 
 	@ApiOperation(value = "Checks the health of the application.", response = SuccessTransport.class)
-	@RequestMapping(value = DashboardConstants.HEALTHCHECK_PATH, method = RequestMethod.GET)
+	@GetMapping(HEALTH_METHOD)
 	public SuccessTransport getHealth() {
 		logger.debug("getHealth");
 		return new SuccessTransport(200, "Dashboard is healthy!");
 	}
 
 	@ApiOperation(value = "Gets the list of application users.", response = DashboardUser.class, responseContainer = "List")
-	@RequestMapping(value = DashboardConstants.USER_PATH, method = RequestMethod.GET)
+	@GetMapping(USER_METHOD)
 	public DashboardUser[] getUsers() {
 		logger.debug("getUsers");
 		return users;