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%2Fconfig%2FAnrXappMockConfiguration.java;h=a1e276d5ae3c0aa4610cb3cd09d112955668744e;hb=93a44cb851a49c923126f32016646860d104075c;hp=340036aa793c5a1a7ad069775d94864c75db6a21;hpb=81c5a43871449332f9a9560c7cf25d07cf714d8e;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AnrXappMockConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AnrXappMockConfiguration.java
index 340036aa..a1e276d5 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AnrXappMockConfiguration.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AnrXappMockConfiguration.java
@@ -51,18 +51,23 @@ public class AnrXappMockConfiguration {
 
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
-	private final NeighborCellRelationTable ncrt, ncrtNodeB1, ncrtNodeB2, ncrtNodeB3;
+	// Sonar wants separate declarations
+	private final NeighborCellRelationTable ncrt;
+	private final NeighborCellRelationTable ncrtNodeB1;
+	private final NeighborCellRelationTable ncrtNodeB2;
+	private final NeighborCellRelationTable ncrtNodeB3;
+
 	private final GgNodeBTable gNodebTable;
 
-	private static final String gnodeb1 = "GNB:001EF5:0045FE50";
-	private static final String gnodeb2 = "GNB:001EF6:0045FE51";
-	private static final String gnodeb3 = "GNB:001EF7:0045FE52";
+	private static final String GNODEB1 = "001EF5:0045FE50";
+	private static final String GNODEB2 = "001EF6:0045FE51";
+	private static final String GNODEB3 = "001EF7:0045FE52";
 
 	public AnrXappMockConfiguration() {
 
 		logger.info("Configuring mock ANR xApp client");
 		gNodebTable = new GgNodeBTable();
-		gNodebTable.addGNodeBIdsItem(gnodeb1).addGNodeBIdsItem(gnodeb2).addGNodeBIdsItem(gnodeb3);
+		gNodebTable.addGNodeBIdsItem(GNODEB1).addGNodeBIdsItem(GNODEB2).addGNodeBIdsItem(GNODEB3);
 		ncrtNodeB1 = new NeighborCellRelationTable();
 		ncrtNodeB2 = new NeighborCellRelationTable();
 		ncrtNodeB3 = new NeighborCellRelationTable();
@@ -70,18 +75,18 @@ public class AnrXappMockConfiguration {
 		String[] neighbors1 = { "1104", "1105", "1106" };
 		for (String n : neighbors1)
 			ncrtNodeB1.addNcrtRelationsItem(
-					new NeighborCellRelation().servingCellNrcgi(gnodeb1 + ":1100").neighborCellNrpci(n)
-							.neighborCellNrcgi(gnodeb1 + ":" + n).flagNoHo(true).flagNoXn(true).flagNoRemove(true));
+					new NeighborCellRelation().servingCellNrcgi(GNODEB1 + ":1100").neighborCellNrpci(n)
+							.neighborCellNrcgi(GNODEB1 + ":" + n).flagNoHo(true).flagNoXn(true).flagNoRemove(true));
 		String[] neighbors2 = { "1471", "1472", "1473" };
 		for (String n : neighbors2)
 			ncrtNodeB2.addNcrtRelationsItem(
-					new NeighborCellRelation().servingCellNrcgi(gnodeb2 + ":1400").neighborCellNrpci(n)
-							.neighborCellNrcgi(gnodeb2 + ":" + n).flagNoHo(false).flagNoXn(false).flagNoRemove(false));
+					new NeighborCellRelation().servingCellNrcgi(GNODEB2 + ":1400").neighborCellNrpci(n)
+							.neighborCellNrcgi(GNODEB2 + ":" + n).flagNoHo(false).flagNoXn(false).flagNoRemove(false));
 		String[] neighbors3 = { "3601", "3601", "3602" };
 		for (String n : neighbors3)
 			ncrtNodeB3.addNcrtRelationsItem(
-					new NeighborCellRelation().servingCellNrcgi(gnodeb3 + ":3600").neighborCellNrpci(n)
-							.neighborCellNrcgi(gnodeb3 + ":" + n).flagNoHo(true).flagNoXn(true).flagNoRemove(true));
+					new NeighborCellRelation().servingCellNrcgi(GNODEB3 + ":3600").neighborCellNrpci(n)
+							.neighborCellNrcgi(GNODEB3 + ":" + n).flagNoHo(true).flagNoXn(true).flagNoRemove(true));
 		for (NeighborCellRelation ncr : ncrtNodeB1.getNcrtRelations())
 			ncrt.addNcrtRelationsItem(ncr);
 		for (NeighborCellRelation ncr : ncrtNodeB2.getNcrtRelations())
@@ -102,12 +107,8 @@ public class AnrXappMockConfiguration {
 		ApiClient apiClient = apiClient();
 		HealthApi mockApi = mock(HealthApi.class);
 		when(mockApi.getApiClient()).thenReturn(apiClient);
-		doAnswer(i -> {
-			return null;
-		}).when(mockApi).getHealthAlive();
-		doAnswer(i -> {
-			return null;
-		}).when(mockApi).getHealthReady();
+		doAnswer(i -> null).when(mockApi).getHealthAlive();
+		doAnswer(i -> null).when(mockApi).getHealthReady();
 		return mockApi;
 	}
 
@@ -121,15 +122,12 @@ public class AnrXappMockConfiguration {
 		// Swagger sends nulls; front end sends empty strings
 		when(mockApi.getNcrt((String) isNull(), (String) isNull(), (String) isNull())).thenReturn(ncrt);
 		when(mockApi.getNcrt(eq(""), any(String.class), any(String.class))).thenReturn(ncrt);
-		when(mockApi.getNcrt(eq(gnodeb1), any(String.class), any(String.class))).thenReturn(ncrtNodeB1);
-		when(mockApi.getNcrt(eq(gnodeb2), any(String.class), any(String.class))).thenReturn(ncrtNodeB2);
-		when(mockApi.getNcrt(eq(gnodeb3), any(String.class), any(String.class))).thenReturn(ncrtNodeB3);
-		doAnswer(i -> {
-			return null;
-		}).when(mockApi).deleteNcrt(any(String.class), any(String.class));
-		doAnswer(i -> {
-			return null;
-		}).when(mockApi).modifyNcrt(any(String.class), any(String.class), any(NeighborCellRelationMod.class));
+		when(mockApi.getNcrt(eq(GNODEB1), any(String.class), any(String.class))).thenReturn(ncrtNodeB1);
+		when(mockApi.getNcrt(eq(GNODEB2), any(String.class), any(String.class))).thenReturn(ncrtNodeB2);
+		when(mockApi.getNcrt(eq(GNODEB3), any(String.class), any(String.class))).thenReturn(ncrtNodeB3);
+		doAnswer(i -> null).when(mockApi).deleteNcrt(any(String.class), any(String.class));
+		doAnswer(i -> null).when(mockApi).modifyNcrt(any(String.class), any(String.class),
+				any(NeighborCellRelationMod.class));
 		return mockApi;
 	}