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%2FAnrXappController.java;h=7f14cdee0931e63593feef514e583d0bdd3277dc;hb=0d109ab39573a2d912bc1d963ab93f3006730721;hp=b3cdcbbf8c51dbdcc9b8007e5c25e60d2d82acbd;hpb=c95e48b5c8cdf93a351859889bb785b317253dde;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AnrXappController.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AnrXappController.java
index b3cdcbbf..7f14cdee 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AnrXappController.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AnrXappController.java
@@ -23,7 +23,6 @@ import java.lang.invoke.MethodHandles;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.oransc.ric.anrxapp.client.api.GnodebsApi;
 import org.oransc.ric.anrxapp.client.api.HealthApi;
 import org.oransc.ric.anrxapp.client.api.NcrtApi;
 import org.oransc.ric.anrxapp.client.model.GgNodeBTable;
@@ -68,16 +67,13 @@ public class AnrXappController {
 
 	// Populated by the autowired constructor
 	private final HealthApi healthApi;
-	private final GnodebsApi gnodebsApi;
 	private final NcrtApi ncrtApi;
 
 	@Autowired
-	public AnrXappController(final HealthApi healthApi, final GnodebsApi gnodebsApi, final NcrtApi ncrtApi) {
+	public AnrXappController(final HealthApi healthApi, final NcrtApi ncrtApi) {
 		Assert.notNull(healthApi, "API must not be null");
-		Assert.notNull(gnodebsApi, "API must not be null");
 		Assert.notNull(ncrtApi, "API must not be null");
 		this.healthApi = healthApi;
-		this.gnodebsApi = gnodebsApi;
 		this.ncrtApi = ncrtApi;
 	}
 
@@ -107,7 +103,7 @@ public class AnrXappController {
 	@ApiOperation(value = "Returns list of gNodeB IDs based on NCRT in ANR", response = GgNodeBTable.class)
 	@RequestMapping(value = "/gnodebs", method = RequestMethod.GET)
 	public GgNodeBTable getGnodebs() {
-		return gnodebsApi.getgNodeB();
+		return ncrtApi.getgNodeB();
 	}
 
 	@ApiOperation(value = "Returns neighbor cell relation table for all gNodeBs or based on query parameters", response = NeighborCellRelationTable.class)
@@ -118,7 +114,7 @@ public class AnrXappController {
 			@RequestParam(name = QP_NEIGHBOR, required = false) String neighborCellNrpci) {
 		logger.debug("getNcrtInfo: ggnbid {}, servingCellNrpci {} neighborCellNrcgi {}", ggnbId, servingCellNrcgi,
 				neighborCellNrpci);
-		return ncrtApi.getNcrtInfo(ggnbId, servingCellNrcgi, neighborCellNrpci);
+		return ncrtApi.getNcrt(ggnbId, servingCellNrcgi, neighborCellNrpci);
 	}
 
 	// /ncrt/servingcells/{servCellNrcgi}/neighborcells/{neighCellNrpci} :