From 612bc189751521566f2720adf2a58946786ecf59 Mon Sep 17 00:00:00 2001
From: "guillaume.lambert" <guillaume.lambert@orange.com>
Date: Sun, 17 Mar 2024 21:53:38 +0100
Subject: [PATCH] Refactor Networkmodel PortMappingListener

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Id4c08284c6f032258d1cc00920ccb208ccee6e8c
---
 .../listeners/PortMappingListener.java        | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/PortMappingListener.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/PortMappingListener.java
index 8bc1db81c..5122c39c2 100644
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/PortMappingListener.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/PortMappingListener.java
@@ -30,17 +30,21 @@ public class PortMappingListener implements DataTreeChangeListener<Mapping> {
     @Override
     public void onDataTreeChanged(@NonNull List<DataTreeModification<Mapping>> changes) {
         for (DataTreeModification<Mapping> change : changes) {
-            if (change.getRootNode().dataBefore() != null && change.getRootNode().dataAfter() != null) {
-                Mapping oldMapping = change.getRootNode().dataBefore();
-                Mapping newMapping = change.getRootNode().dataAfter();
-                if (oldMapping.getPortAdminState().equals(newMapping.getPortAdminState())
-                        && oldMapping.getPortOperState().equals(newMapping.getPortOperState())) {
-                    return;
-                } else {
-                    networkModelService.updateOpenRoadmTopologies(
-                            getNodeIdFromMappingDataTreeIdentifier(change.getRootPath()), newMapping);
-                }
+            Mapping oldMapping = change.getRootNode().dataBefore();
+            if (oldMapping == null) {
+                continue;
             }
+            Mapping newMapping = change.getRootNode().dataAfter();
+            if (newMapping == null) {
+                continue;
+            }
+            if (oldMapping.getPortAdminState().equals(newMapping.getPortAdminState())
+                    && oldMapping.getPortOperState().equals(newMapping.getPortOperState())) {
+                return;
+            }
+            networkModelService.updateOpenRoadmTopologies(
+                getNodeIdFromMappingDataTreeIdentifier(change.getRootPath()),
+                newMapping);
         }
     }
 
-- 
2.36.6