code coverage for M3

[dcaegen2/services/son-handler.git] / src / main / java / org / onap / dcaegen2 / services / sonhms / child / ChildThread.java

diff --git a/src/main/java/com/wipro/www/sonhms/child/ChildThread.java b/src/main/java/org/onap/dcaegen2/services/sonhms/child/ChildThread.java
similarity index 81%
rename from src/main/java/com/wipro/www/sonhms/child/ChildThread.java
rename to src/main/java/org/onap/dcaegen2/services/sonhms/child/ChildThread.java
index 718cc46..eff7a84 100644 (file)
--- a/src/main/java/com/wipro/www/sonhms/child/ChildThread.java
+++ b/src/main/java/org/onap/dcaegen2/services/sonhms/child/ChildThread.java
@@ -1,32 +1,33 @@
 /*******************************************************************************
- * ============LICENSE_START=======================================================
- * pcims
+ *  ============LICENSE_START=======================================================
+ *  son-handler
  *  ================================================================================
- *  Copyright (C) 2018 Wipro Limited.
- *  ==============================================================================
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *   ============LICENSE_END=========================================================
- ******************************************************************************/
-
-package com.wipro.www.sonhms.child;
-
-
-import com.wipro.www.sonhms.Configuration;
-import com.wipro.www.sonhms.dao.ClusterDetailsRepository;
-import com.wipro.www.sonhms.model.FapServiceList;
-import com.wipro.www.sonhms.model.ThreadId;
-import com.wipro.www.sonhms.restclient.AsyncResponseBody;
-import com.wipro.www.sonhms.utils.BeanUtil;
+ *   Copyright (C) 2019 Wipro Limited.
+ *   ==============================================================================
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *  
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ *     ============LICENSE_END=========================================================
+ *  
+ *******************************************************************************/
+
+package org.onap.dcaegen2.services.sonhms.child;
+
+import org.onap.dcaegen2.services.sonhms.Configuration;
+import org.onap.dcaegen2.services.sonhms.dao.ClusterDetailsRepository;
+import org.onap.dcaegen2.services.sonhms.model.FapServiceList;
+import org.onap.dcaegen2.services.sonhms.model.ThreadId;
+import org.onap.dcaegen2.services.sonhms.restclient.AsyncResponseBody;
+import org.onap.dcaegen2.services.sonhms.utils.BeanUtil;
+import org.onap.dcaegen2.services.sonhms.utils.ClusterUtils;
 
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -44,8 +45,7 @@ public class ChildThread implements Runnable {
 
     private BlockingQueue<List<String>> childStatusUpdate;
     private BlockingQueue<FapServiceList> queue = new LinkedBlockingQueue<>();
-    // static BlockingQueue<AsyncResponseBody> asynchronousResponse = new
-    // LinkedBlockingQueue<>();
+
     private static Map<Long, AsyncResponseBody> responseMap = new HashMap<>();
     private Graph cluster;
     private ThreadId threadId;
@@ -98,7 +98,7 @@ public class ChildThread implements Runnable {
      */
     public static void putResponse(Long threadId, AsyncResponseBody obj) {
         synchronized (responseMap) {
-            responseMap.put(threadId, obj);
+            responseMap.put(threadId, obj); 
         }
 
     }
@@ -130,7 +130,7 @@ public class ChildThread implements Runnable {
 
         ClusterFormation clusterFormation = new ClusterFormation(queue);
         StateOof oof = new StateOof(childStatusUpdate);
-        ClusterModification clusterModification = new ClusterModification();
+        ClusterUtils clusterUtils = new ClusterUtils();
         Detection detect = new Detection();
 
         try {
@@ -152,7 +152,7 @@ public class ChildThread implements Runnable {
                 if (isNotificationsBuffered()) {
                     List<FapServiceList> fapServiceLists = bufferNotification();
                     for (FapServiceList fapService : fapServiceLists) {
-                        cluster = clusterModification.clustermod(cluster, fapService);
+                        cluster = clusterUtils.modifyCluster(cluster, fapService);
                     }
                     String cellPciNeighbourString = cluster.getPciNeighbourJson();
                     UUID clusterId = cluster.getGraphId();