From 5db8f9da8f6c8bed1c3d69fe4481cc9d7a9b4584 Mon Sep 17 00:00:00 2001
From: manuelstefanile <manuel.stefanile@accenture.com>
Date: Thu, 20 Mar 2025 11:58:40 +0100
Subject: [PATCH] Ril. MNP_SM_2460 - GATEWAY MNP DBC||R58-24-1170||errore
 ERRORE UNMARSHAL campi mancanti nella retrieve xml

---
 .../GispRetrieveDonorFormatController.java    |  2 +-
 .../mnp/src/mnp/xml/dao/RetrieveGispXAO.java  | 34 ++++++++++++-------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/dbcmnpsrc/FE/mnpdev/mnp/src/mnp/systemcontroller/gisp/formatcontroller/GispRetrieveDonorFormatController.java b/dbcmnpsrc/FE/mnpdev/mnp/src/mnp/systemcontroller/gisp/formatcontroller/GispRetrieveDonorFormatController.java
index ac6a28c..41f05d3 100644
--- a/dbcmnpsrc/FE/mnpdev/mnp/src/mnp/systemcontroller/gisp/formatcontroller/GispRetrieveDonorFormatController.java
+++ b/dbcmnpsrc/FE/mnpdev/mnp/src/mnp/systemcontroller/gisp/formatcontroller/GispRetrieveDonorFormatController.java
@@ -100,7 +100,7 @@ public class GispRetrieveDonorFormatController {
      * @return RetrieveGisp
      */
     public MnpGispRetrieveOut formatEsoDTO(String tracciato) throws Exception {
-        return RetrieveGispXAO.getRetrieveESOFromXmlResponse(tracciato);
+        return RetrieveGispXAO.getRetrieveESOFromJsonResponse(tracciato);
     }
 
   /**
diff --git a/dbcmnpsrc/FE/mnpdev/mnp/src/mnp/xml/dao/RetrieveGispXAO.java b/dbcmnpsrc/FE/mnpdev/mnp/src/mnp/xml/dao/RetrieveGispXAO.java
index 039eae8..f351672 100644
--- a/dbcmnpsrc/FE/mnpdev/mnp/src/mnp/xml/dao/RetrieveGispXAO.java
+++ b/dbcmnpsrc/FE/mnpdev/mnp/src/mnp/xml/dao/RetrieveGispXAO.java
@@ -392,7 +392,7 @@ public class RetrieveGispXAO {
      * @param xmlResponse String
      * @return String
      */
-    public static MnpGispRetrieveOut getRetrieveESOFromXmlResponse(String xmlResponse) throws Exception{
+    public static MnpGispRetrieveOut getRetrieveESOFromJsonResponse(String xmlResponse) throws Exception{
         MnpGispRetrieveOut retrieveGisp= new MnpGispRetrieveOut();
         try {
             // databinding con validazione
@@ -408,7 +408,9 @@ public class RetrieveGispXAO {
                 mnp.proxy.ws.sdp.client.Attributi attributi = response.getAttributi();
                 retrieveGisp.setStato(attributi.getStato());
                 //cessazione_mnp
-                retrieveGisp.setRespCessazioneMnp(attributi.getDettaglioStato().getCessazioneMnp());
+                if(attributi.getDettaglioStato()!=null){
+                    retrieveGisp.setRespCessazioneMnp(attributi.getDettaglioStato().getCessazioneMnp());
+                }
                 //operatore_virtuale
                 retrieveGisp.setRespOperatoreInterno(attributi.getEsp());
                 // Descrizione profilo
@@ -416,21 +418,27 @@ public class RetrieveGispXAO {
                 //profilo
                 retrieveGisp.setProfilo(attributi.getProfilo());
                 //blocco
-                retrieveGisp.setAnagr(attributi.getBlocco().getAnagr());
-                retrieveGisp.setRespFs(attributi.getBlocco().getFs());
-                retrieveGisp.setRespFraud(attributi.getBlocco().getFraud());
-
+                if(attributi.getBlocco()!=null){
+                    retrieveGisp.setAnagr(attributi.getBlocco().getAnagr());
+                    retrieveGisp.setRespFs(attributi.getBlocco().getFs());
+                    retrieveGisp.setRespFraud(attributi.getBlocco().getFraud());
+                }
+                //tipologia
                 retrieveGisp.setRespTipologia(attributi.getTipologia());
-                retrieveGisp.setRespValueUsage(attributi.getUsage().getValue());
+                //usage (value and main_msisdn)
+                if(attributi.getUsage()!=null){
+                    retrieveGisp.setRespValueUsage(attributi.getUsage().getValue());
 
-                if (!retrieveGisp.getRespValueUsage().equals(GispMap.MAIN_USAGE)
-                        || !retrieveGisp.getRespValueUsage().equals(GispMap.TCB_PADRE_USAGE)){
-                    retrieveGisp.setRespMainMsisdn(attributi.getUsage().getMainMsisdn());
+                    if (!retrieveGisp.getRespValueUsage().equals(GispMap.MAIN_USAGE)
+                            || !retrieveGisp.getRespValueUsage().equals(GispMap.TCB_PADRE_USAGE)){
+                        retrieveGisp.setRespMainMsisdn(attributi.getUsage().getMainMsisdn());
+                    }
                 }
                 //dati commerciali
-                retrieveGisp.setRespCfPiva(attributi.getDatiCommerciali().getCliente());
-                retrieveGisp.setRespMarcaggio(attributi.getDatiCommerciali().getMarcaggioCliente());
-
+                if(attributi.getDatiCommerciali()!=null){
+                    retrieveGisp.setRespCfPiva(attributi.getDatiCommerciali().getCliente());
+                    retrieveGisp.setRespMarcaggio(attributi.getDatiCommerciali().getMarcaggioCliente());
+                }
                 retrieveGisp.setRespPrepagato(attributi.getPrepagato());
             }//chiude if attributi