X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dashboard%2Fwebapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fcontroller%2FAppManagerController.java;h=cd3d8a91e5fa75a91b59f2e8fee2d7fe817a35a9;hb=0defe5112010238bffdbc52199b35163cb0999ee;hp=0a9d0c80a4356ec66b3980ce9b9749bab61cbe30;hpb=64a5e9470799236f0af4ce2df98f77c94eb1bed3;p=portal%2Fric-dashboard.git

diff --git a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AppManagerController.java b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AppManagerController.java
index 0a9d0c80..cd3d8a91 100644
--- a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AppManagerController.java
+++ b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AppManagerController.java
@@ -21,28 +21,27 @@ package org.oransc.ric.portal.dashboard.controller;
 
 import java.lang.invoke.MethodHandles;
 
-import javax.servlet.http.HttpServletResponse;
-
-import org.oransc.ric.plt.appmgr.client.api.HealthApi;
-import org.oransc.ric.plt.appmgr.client.api.XappApi;
-import org.oransc.ric.plt.appmgr.client.model.AllDeployableXapps;
-import org.oransc.ric.plt.appmgr.client.model.AllDeployedXapps;
-import org.oransc.ric.plt.appmgr.client.model.AllXappConfig;
-import org.oransc.ric.plt.appmgr.client.model.ConfigValidationErrors;
-import org.oransc.ric.plt.appmgr.client.model.XAppConfig;
-import org.oransc.ric.plt.appmgr.client.model.Xapp;
-import org.oransc.ric.plt.appmgr.client.model.XappDescriptor;
 import org.oransc.ric.portal.dashboard.DashboardApplication;
 import org.oransc.ric.portal.dashboard.DashboardConstants;
 import org.oransc.ric.portal.dashboard.config.AppManagerApiBuilder;
 import org.oransc.ric.portal.dashboard.model.AppTransport;
 import org.oransc.ric.portal.dashboard.model.DashboardDeployableXapps;
 import org.oransc.ric.portal.dashboard.model.SuccessTransport;
+import org.oransc.ricplt.appmgr.client.api.HealthApi;
+import org.oransc.ricplt.appmgr.client.api.XappApi;
+import org.oransc.ricplt.appmgr.client.model.AllDeployableXapps;
+import org.oransc.ricplt.appmgr.client.model.AllDeployedXapps;
+import org.oransc.ricplt.appmgr.client.model.AllXappConfig;
+import org.oransc.ricplt.appmgr.client.model.ConfigValidationErrors;
+import org.oransc.ricplt.appmgr.client.model.XAppConfig;
+import org.oransc.ricplt.appmgr.client.model.Xapp;
+import org.oransc.ricplt.appmgr.client.model.XappDescriptor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -108,24 +107,23 @@ public class AppManagerController {
 	@GetMapping(DashboardConstants.RIC_INSTANCE_KEY + "/{" + DashboardConstants.RIC_INSTANCE_KEY + "}/"
 			+ HEALTH_ALIVE_METHOD)
 	// No role required
-	public void getHealth(@PathVariable(DashboardConstants.RIC_INSTANCE_KEY) String instanceKey,
-			HttpServletResponse response) {
+	public ResponseEntity<String> getHealth(@PathVariable(DashboardConstants.RIC_INSTANCE_KEY) String instanceKey) {
 		logger.debug("getHealthAlive instance {}", instanceKey);
 		HealthApi api = appManagerApiBuilder.getHealthApi(instanceKey);
 		api.getHealthAlive();
-		response.setStatus(api.getApiClient().getStatusCode().value());
+		return ResponseEntity.status(api.getApiClient().getStatusCode().value()).body(null);
 	}
 
 	@ApiOperation(value = "Readiness check of App Manager - Readiness probe.")
 	@GetMapping(DashboardConstants.RIC_INSTANCE_KEY + "/{" + DashboardConstants.RIC_INSTANCE_KEY + "}/"
 			+ HEALTH_READY_METHOD)
 	// No role required
-	public void getHealthReady(@PathVariable(DashboardConstants.RIC_INSTANCE_KEY) String instanceKey,
-			HttpServletResponse response) {
+	public ResponseEntity<String> getHealthReady(
+			@PathVariable(DashboardConstants.RIC_INSTANCE_KEY) String instanceKey) {
 		logger.debug("getHealthReady instance {}", instanceKey);
 		HealthApi api = appManagerApiBuilder.getHealthApi(instanceKey);
 		api.getHealthReady();
-		response.setStatus(api.getApiClient().getStatusCode().value());
+		return ResponseEntity.status(api.getApiClient().getStatusCode().value()).body(null);
 	}
 
 	@ApiOperation(value = "Returns the configuration of all Xapps.", response = AllXappConfig.class)
@@ -191,12 +189,12 @@ public class AppManagerController {
 	@ApiOperation(value = "Undeploy an existing xapp.")
 	@DeleteMapping(XAPPS_METHOD_PATH + "/{" + PP_XAPP_NAME + "}")
 	@Secured({ DashboardConstants.ROLE_ADMIN })
-	public void undeployXapp(@PathVariable(DashboardConstants.RIC_INSTANCE_KEY) String instanceKey,
-			@PathVariable(PP_XAPP_NAME) String appName, HttpServletResponse response) {
+	public ResponseEntity<String> undeployXapp(@PathVariable(DashboardConstants.RIC_INSTANCE_KEY) String instanceKey,
+			@PathVariable(PP_XAPP_NAME) String appName) {
 		logger.debug("undeployXapp instance {} name {}", instanceKey, appName);
 		XappApi api = appManagerApiBuilder.getXappApi(instanceKey);
 		api.undeployXapp(appName);
-		response.setStatus(api.getApiClient().getStatusCode().value());
+		return ResponseEntity.status(api.getApiClient().getStatusCode().value()).body(null);
 	}
 
 }