Non-functional changes to silence Sonar

[portal/ric-dashboard.git] / webapp-backend / src / main / java / org / oransc / ric / portal / dashboard / config / AnrXappMockConfiguration.java

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 bfaad92..a1e276d 100644 (file)
--- 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
@@ -22,17 +22,16 @@ package org.oransc.ric.portal.dashboard.config;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isNull;
-import static org.mockito.ArgumentMatchers.startsWith;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.lang.invoke.MethodHandles;
 
-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.invoker.ApiClient;
+import org.oransc.ric.anrxapp.client.model.GgNodeBTable;
 import org.oransc.ric.anrxapp.client.model.NeighborCellRelation;
 import org.oransc.ric.anrxapp.client.model.NeighborCellRelationMod;
 import org.oransc.ric.anrxapp.client.model.NeighborCellRelationTable;
@@ -52,27 +51,48 @@ public class AnrXappMockConfiguration {
 
        private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
-       private final NeighborCellRelationTable ncrt, ncrtNodeB1, ncrtNodeB2;
-       
+       // 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 = "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);
                ncrtNodeB1 = new NeighborCellRelationTable();
                ncrtNodeB2 = new NeighborCellRelationTable();
+               ncrtNodeB3 = new NeighborCellRelationTable();
                ncrt = new NeighborCellRelationTable();
-               String[] cells1 = { "A", "B", "C", "D" };
-               for (String s : cells1)
+               String[] neighbors1 = { "1104", "1105", "1106" };
+               for (String n : neighbors1)
                        ncrtNodeB1.addNcrtRelationsItem(
-                                       new NeighborCellRelation().servingCellNrcgi(s + "12345").neighborCellNrpci(s + "12346")
-                                                       .neighborCellNrcgi(s + "12347").flagNoHo(true).flagNoXn(true).flagNoRemove(true));
-               String[] cells2 = { "E", "F", "G", "H" };
-               for (String s : cells2)
+                                       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(s + "12345").neighborCellNrpci(s + "12346")
-                                                       .neighborCellNrcgi(s + "12347").flagNoHo(true).flagNoXn(true).flagNoRemove(true));
+                                       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));
                for (NeighborCellRelation ncr : ncrtNodeB1.getNcrtRelations())
                        ncrt.addNcrtRelationsItem(ncr);
                for (NeighborCellRelation ncr : ncrtNodeB2.getNcrtRelations())
                        ncrt.addNcrtRelationsItem(ncr);
+               for (NeighborCellRelation ncr : ncrtNodeB3.getNcrtRelations())
+                       ncrt.addNcrtRelationsItem(ncr);
        }
 
        private ApiClient apiClient() {
@@ -82,45 +102,32 @@ public class AnrXappMockConfiguration {
        }
 
        @Bean
-       public HealthApi anrHealthMockApi() {
-               ApiClient mockClient = mock(ApiClient.class);
-               when(mockClient.getStatusCode()).thenReturn(HttpStatus.OK);
+       // Use the same name as regular configuration
+       public HealthApi anrHealthApi() {
+               ApiClient apiClient = apiClient();
                HealthApi mockApi = mock(HealthApi.class);
-               when(mockApi.getApiClient()).thenReturn(mockClient);
-               doAnswer(i -> {
-                       return null;
-               }).when(mockApi).getHealthAlive();
-               doAnswer(i -> {
-                       return null;
-               }).when(mockApi).getHealthReady();
-               return mockApi;
-       }
-       
-       @Bean
-       public GnodebsApi anrGnodebsMockApi() {
-               ApiClient mockClient = mock(ApiClient.class);
-               when(mockClient.getStatusCode()).thenReturn(HttpStatus.OK);
-               GnodebsApi mockApi = mock(GnodebsApi.class);
-               
+               when(mockApi.getApiClient()).thenReturn(apiClient);
+               doAnswer(i -> null).when(mockApi).getHealthAlive();
+               doAnswer(i -> null).when(mockApi).getHealthReady();
                return mockApi;
        }
 
        @Bean
-       public NcrtApi ncrtMockApi() {
+       // Use the same name as regular configuration
+       public NcrtApi anrNcrtApi() {
                ApiClient apiClient = apiClient();
                NcrtApi mockApi = mock(NcrtApi.class);
                when(mockApi.getApiClient()).thenReturn(apiClient);
+               when(mockApi.getgNodeB()).thenReturn(gNodebTable);
                // Swagger sends nulls; front end sends empty strings
-               when(mockApi.getNcrtInfo((String) isNull(), (String) isNull(), (String) isNull())).thenReturn(ncrt);
-               when(mockApi.getNcrtInfo(eq(""), any(String.class), any(String.class))).thenReturn(ncrt);
-               when(mockApi.getNcrtInfo(startsWith("A"), any(String.class), any(String.class))).thenReturn(ncrtNodeB1);
-               when(mockApi.getNcrtInfo(startsWith("B"), any(String.class), any(String.class))).thenReturn(ncrtNodeB2);
-               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((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 -> 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;
        }