Refactor: Improve code quality and compliance with SonarQube standards

- Consolidated multiple `if` statements to enhance readability and maintainability.
- Replaced traditional `instanceof` checks followed by casting with the new pattern matching syntax for improved type safety and clarity.
- Removed unnecessary casts and streamlined code in `addYangLeafList` and `addDataNodeFromNormalizedNode` methods.

Issue-ID: CPS-1957
Change-Id: I46696dc184b6b3c3d0fe3a6bd12267a4e0d76193
Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/sync/ModuleSyncWatchdog.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/sync/ModuleSyncWatchdog.java
index 4061298..6b34527 100644 (file)
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/sync/ModuleSyncWatchdog.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/sync/ModuleSyncWatchdog.java
@@ -92,16 +92,14 @@ public class ModuleSyncWatchdog {
     }
 
     private void populateWorkQueueIfNeeded() {
-        if (moduleSyncWorkQueue.isEmpty()) {
-            if (workQueueLock.tryLock()) {
-                try {
-                    populateWorkQueue();
-                    if (moduleSyncWorkQueue.isEmpty()) {
-                        setPreviouslyLockedCmHandlesToAdvised();
-                    }
-                } finally {
-                    workQueueLock.unlock();
+        if (moduleSyncWorkQueue.isEmpty() && workQueueLock.tryLock()) {
+            try {
+                populateWorkQueue();
+                if (moduleSyncWorkQueue.isEmpty()) {
+                    setPreviouslyLockedCmHandlesToAdvised();
                 }
+            } finally {
+                workQueueLock.unlock();
             }
         }
     }

diff --git a/cps-service/src/main/java/org/onap/cps/spi/model/DataNodeBuilder.java b/cps-service/src/main/java/org/onap/cps/spi/model/DataNodeBuilder.java
index 9859acd..de57914 100644 (file)
--- a/cps-service/src/main/java/org/onap/cps/spi/model/DataNodeBuilder.java
+++ b/cps-service/src/main/java/org/onap/cps/spi/model/DataNodeBuilder.java
@@ -204,18 +204,17 @@ public class DataNodeBuilder {
     private static void addDataNodeFromNormalizedNode(final DataNode currentDataNode,
         final NormalizedNode normalizedNode) {
 
-        if (normalizedNode instanceof ChoiceNode) {
-            addChoiceNode(currentDataNode, (ChoiceNode) normalizedNode);
-        } else if (normalizedNode instanceof DataContainerNode) {
-            addYangContainer(currentDataNode, (DataContainerNode) normalizedNode);
-        } else if (normalizedNode instanceof MapNode) {
-            addDataNodeForEachListElement(currentDataNode, (MapNode) normalizedNode);
-        } else if (normalizedNode instanceof ValueNode) {
-            final ValueNode<NormalizedNode> valuesNode = (ValueNode) normalizedNode;
-            addYangLeaf(currentDataNode, valuesNode.getIdentifier().getNodeType().getLocalName(),
-                    (Serializable) valuesNode.body());
-        } else if (normalizedNode instanceof LeafSetNode) {
-            addYangLeafList(currentDataNode, (LeafSetNode<?>) normalizedNode);
+        if (normalizedNode instanceof ChoiceNode choiceNode) {
+            addChoiceNode(currentDataNode, choiceNode);
+        } else if (normalizedNode instanceof DataContainerNode dataContainerNode) {
+            addYangContainer(currentDataNode, dataContainerNode);
+        } else if (normalizedNode instanceof MapNode mapNode) {
+            addDataNodeForEachListElement(currentDataNode, mapNode);
+        } else if (normalizedNode instanceof ValueNode<?> valueNode) {
+            addYangLeaf(currentDataNode, valueNode.getIdentifier().getNodeType().getLocalName(),
+                    (Serializable) valueNode.body());
+        } else if (normalizedNode instanceof LeafSetNode<?> leafSetNode) {
+            addYangLeafList(currentDataNode, leafSetNode);
         } else {
             log.warn("Unsupported NormalizedNode type detected: {}", normalizedNode.getClass());
         }
@@ -243,7 +242,7 @@ public class DataNodeBuilder {
 
     private static void addYangLeafList(final DataNode currentDataNode, final LeafSetNode<?> leafSetNode) {
         final String leafListName = leafSetNode.getIdentifier().getNodeType().getLocalName();
-        List<?> leafListValues = ((Collection<? extends NormalizedNode>) leafSetNode.body())
+        List<?> leafListValues = (leafSetNode.body())
                 .stream()
                 .map(NormalizedNode::body)
                 .collect(Collectors.toList());