Adeguati schemi e WSDL alla versione 6.2.0 di pagoPA.

link-it · Aug 30, 2019 · 43c5ab0 · 43c5ab0
1 parent 43988a5
commit 43c5ab0
Show file tree

Hide file tree

Showing 42 changed files with 2,575 additions and 2,549 deletions.
diff --git a/ear/pom.xml b/ear/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>bom</artifactId>
 		<groupId>it.govpay</groupId>
-		<version>3.1.0-RC2-SNAPSHOT</version>
+		<version>3.1.0-RC2</version>
 	</parent>
 
 	<artifactId>ear</artifactId>

diff --git a/integration-test/src/test/java/test/workflow/modello3/v1/modello3-non-autorizzato.feature b/integration-test/src/test/java/test/workflow/modello3/v1/modello3-non-autorizzato.feature
@@ -25,13 +25,13 @@ Then assert responseStatus == 200 || responseStatus == 201
 	}
 """
 
-Scenario: Verifica pagamento sconosciuto
+Scenario: Verifica pagamento
 
 * def numeroAvviso = '000000000000000000'
 * call read('classpath:utils/psp-verifica-rpt.feature')
 * match response.faultBean == faultBean
 
-Scenario: Attiva pagamento sconosciuto
+Scenario: Attiva pagamento
 
 * def numeroAvviso = '000000000000000000'
 * def iuv = '000000000000000'

diff --git a/jars/api-commons/pom.xml b/jars/api-commons/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>jars</artifactId>
 		<groupId>it.govpay</groupId>
-		<version>3.1.0-RC2-SNAPSHOT</version>
+		<version>3.1.0-RC2</version>
 	</parent>
 
 	<artifactId>api-commons</artifactId>

diff --git a/jars/client-api-ente/pom.xml b/jars/client-api-ente/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>jars</artifactId>
 		<groupId>it.govpay</groupId>
-		<version>3.1.0-RC2-SNAPSHOT</version>
+		<version>3.1.0-RC2</version>
 	</parent>
 
 	<artifactId>client-api-ente</artifactId>

diff --git a/jars/core-beans/pom.xml b/jars/core-beans/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>jars</artifactId>
 		<groupId>it.govpay</groupId>
-		<version>3.1.0-RC2-SNAPSHOT</version>
+		<version>3.1.0-RC2</version>
 	</parent>
 
 	<artifactId>core-beans</artifactId>

diff --git a/jars/core/pom.xml b/jars/core/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>jars</artifactId>
 		<groupId>it.govpay</groupId>
-		<version>3.1.0-RC2-SNAPSHOT</version>
+		<version>3.1.0-RC2</version>
 	</parent>
 
 	<artifactId>core</artifactId>

diff --git a/jars/fonts-titilliumWeb/pom.xml b/jars/fonts-titilliumWeb/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>jars</artifactId>
 		<groupId>it.govpay</groupId>
-		<version>3.1.0-RC2-SNAPSHOT</version>
+		<version>3.1.0-RC2</version>
 	</parent>
 
 	<artifactId>fonts-TitilliumWeb</artifactId>

diff --git a/jars/orm-beans/pom.xml b/jars/orm-beans/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>jars</artifactId>
 		<groupId>it.govpay</groupId>
-		<version>3.1.0-RC2-SNAPSHOT</version>
+		<version>3.1.0-RC2</version>
 	</parent>
 
 	<artifactId>orm-beans</artifactId>

diff --git a/jars/orm/pom.xml b/jars/orm/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>jars</artifactId>
 		<groupId>it.govpay</groupId>
-		<version>3.1.0-RC2-SNAPSHOT</version>
+		<version>3.1.0-RC2</version>
 	</parent>
 
 	<artifactId>orm</artifactId>

diff --git a/jars/pagopa-beans/pom.xml b/jars/pagopa-beans/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>jars</artifactId>
 		<groupId>it.govpay</groupId>
-		<version>3.1.0-RC2-SNAPSHOT</version>
+		<version>3.1.0-RC2</version>
 	</parent>
 
 	<artifactId>pagopa-beans</artifactId>

diff --git a/jars/pagopa-beans/src/main/resources/wsdl/NodoPerPa.wsdl b/jars/pagopa-beans/src/main/resources/wsdl/NodoPerPa.wsdl
@@ -6,16 +6,16 @@
   Renaming delle primitive.
 -->
 <wsdl:definitions
-        xmlns:ppt="http://ws.pagamenti.telematici.gov/"
-        xmlns:ppthead="http://ws.pagamenti.telematici.gov/ppthead"
-        xmlns:tns="http://NodoPagamentiSPC.spcoop.gov.it/servizi/PagamentiTelematiciRPT"
-        xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata"
-        xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-        xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-        name="PagamentiTelematiciRPTservice"
-        targetNamespace="http://NodoPagamentiSPC.spcoop.gov.it/servizi/PagamentiTelematiciRPT"
+		xmlns:ppt="http://ws.pagamenti.telematici.gov/"
+		xmlns:ppthead="http://ws.pagamenti.telematici.gov/ppthead"
+		xmlns:tns="http://NodoPagamentiSPC.spcoop.gov.it/servizi/PagamentiTelematiciRPT"
+		xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata"
+		xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+		xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+		xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+		name="PagamentiTelematiciRPTservice"
+		targetNamespace="http://NodoPagamentiSPC.spcoop.gov.it/servizi/PagamentiTelematiciRPT"
 >
 	<wsdl:types>
 		<xsd:schema version="2.1.2" targetNamespace="http://ws.pagamenti.telematici.gov/ppthead">
@@ -99,7 +99,7 @@
 					<xsd:enumeration value="CP" /> <!-- Carta di Pagamento -->
 					<xsd:enumeration value="PO" /> <!-- Pagamento attivato presso PSP  -->
 					<xsd:enumeration value="OBEP" /> <!-- Online Banking Electronic Payment -->
-		            <xsd:maxLength value="4" />
+					<xsd:maxLength value="4" />
 				</xsd:restriction>
 			</xsd:simpleType>
 			<xsd:element name="nodoChiediCopiaRT" type="ppt:nodoChiediCopiaRT" />
@@ -129,19 +129,19 @@
 			<xsd:element name="nodoPAChiediInformativaPA" type="ppt:nodoPAChiediInformativaPA" />
 			<xsd:element name="nodoPAChiediInformativaPARisposta" type="ppt:nodoPAChiediInformativaPARisposta" />
 
-        	<xsd:element name="nodoChiediElencoQuadraturePA" type="ppt:nodoChiediElencoQuadraturePA" />
-        	<xsd:element name="nodoChiediElencoQuadraturePARisposta" type="ppt:nodoChiediElencoQuadraturePARisposta" />
+			<xsd:element name="nodoChiediElencoQuadraturePA" type="ppt:nodoChiediElencoQuadraturePA" />
+			<xsd:element name="nodoChiediElencoQuadraturePARisposta" type="ppt:nodoChiediElencoQuadraturePARisposta" />
 
-        	<xsd:element name="nodoChiediQuadraturaPA" type="ppt:nodoChiediQuadraturaPA" />
-        	<xsd:element name="nodoChiediQuadraturaPARisposta" type="ppt:nodoChiediQuadraturaPARisposta" />
+			<xsd:element name="nodoChiediQuadraturaPA" type="ppt:nodoChiediQuadraturaPA" />
+			<xsd:element name="nodoChiediQuadraturaPARisposta" type="ppt:nodoChiediQuadraturaPARisposta" />
 
-        	<xsd:element name="nodoChiediElencoFlussiRendicontazione" type="ppt:nodoChiediElencoFlussiRendicontazione" />
-        	<xsd:element name="nodoChiediElencoFlussiRendicontazioneRisposta" type="ppt:nodoChiediElencoFlussiRendicontazioneRisposta" />
+			<xsd:element name="nodoChiediElencoFlussiRendicontazione" type="ppt:nodoChiediElencoFlussiRendicontazione" />
+			<xsd:element name="nodoChiediElencoFlussiRendicontazioneRisposta" type="ppt:nodoChiediElencoFlussiRendicontazioneRisposta" />
 
-        	<xsd:element name="nodoChiediFlussoRendicontazione" type="ppt:nodoChiediFlussoRendicontazione" />
-        	<xsd:element name="nodoChiediFlussoRendicontazioneRisposta" type="ppt:nodoChiediFlussoRendicontazioneRisposta" />
+			<xsd:element name="nodoChiediFlussoRendicontazione" type="ppt:nodoChiediFlussoRendicontazione" />
+			<xsd:element name="nodoChiediFlussoRendicontazioneRisposta" type="ppt:nodoChiediFlussoRendicontazioneRisposta" />
 
-    		<xsd:element name="nodoChiediSceltaWISP" type="ppt:nodoChiediSceltaWISP" />
+			<xsd:element name="nodoChiediSceltaWISP" type="ppt:nodoChiediSceltaWISP" />
 			<xsd:element name="nodoChiediSceltaWISPRisposta" type="ppt:nodoChiediSceltaWISPRisposta" />
 
 			<xsd:complexType name="risposta">
@@ -349,7 +349,7 @@
 					<xsd:element name="identificativoIntermediarioPA" type="ppt:stText35" />
 					<xsd:element name="identificativoStazioneIntermediarioPA" type="ppt:stText35" />
 					<xsd:element name="password" type="ppt:stPassword" />
-					<xsd:element name="identificativoDominio" type="ppt:stText35" minOccurs="0" />
+					<xsd:element name="identificativoDominio" type="ppt:stText35" />
 					<xsd:element name="rangeDa" type="xsd:dateTime" minOccurs="0" />
 					<xsd:element name="rangeA" type="xsd:dateTime" minOccurs="0" />
 					<xsd:element name="dimensioneLista" type="xsd:positiveInteger" />
@@ -387,7 +387,7 @@
 					<xsd:element name="identificativoIntermediarioPA" type="ppt:stText35" />
 					<xsd:element name="identificativoStazioneIntermediarioPA" type="ppt:stText35" />
 					<xsd:element name="password" type="ppt:stPassword" />
-					<xsd:element name="identificativoDominio" type="ppt:stText35" minOccurs="0" />
+					<xsd:element name="identificativoDominio" type="ppt:stText35"/>
 					<xsd:element name="identificativoPSP" type="ppt:stText35" minOccurs="0" />
 				</xsd:sequence>
 			</xsd:complexType>
@@ -426,7 +426,7 @@
 					<xsd:element name="identificativoIntermediarioPA" type="ppt:stText35" />
 					<xsd:element name="identificativoStazioneIntermediarioPA" type="ppt:stText35" />
 					<xsd:element name="password" type="ppt:stPassword" />
-					<xsd:element name="identificativoDominio" type="ppt:stText35" minOccurs="0" />
+					<xsd:element name="identificativoDominio" type="ppt:stText35" />
 				</xsd:sequence>
 			</xsd:complexType>
 
@@ -459,7 +459,7 @@
 					<xsd:element name="identificativoIntermediarioPA" type="ppt:stText35" />
 					<xsd:element name="identificativoStazioneIntermediarioPA" type="ppt:stText35" />
 					<xsd:element name="password" type="ppt:stPassword" />
-					<xsd:element name="identificativoDominio" type="ppt:stText35" minOccurs="0" />
+					<xsd:element name="identificativoDominio" type="ppt:stText35" />
 					<xsd:element name="identificativoFlusso" type="xsd:string" />
 				</xsd:sequence>
 			</xsd:complexType>
@@ -479,7 +479,7 @@
 					<xsd:element name="identificativoIntermediarioPA" type="ppt:stText35" />
 					<xsd:element name="identificativoStazioneIntermediarioPA" type="ppt:stText35" />
 					<xsd:element name="password" type="ppt:stPassword" />
-					<xsd:element name="identificativoDominio" type="ppt:stText35" minOccurs="0" />
+					<xsd:element name="identificativoDominio" type="ppt:stText35" />
 					<xsd:element name="identificativoPSP" type="ppt:stText35" minOccurs="0" />
 				</xsd:sequence>
 			</xsd:complexType>
@@ -513,7 +513,7 @@
 					<xsd:element name="identificativoIntermediarioPA" type="ppt:stText35" />
 					<xsd:element name="identificativoStazioneIntermediarioPA" type="ppt:stText35" />
 					<xsd:element name="password" type="ppt:stPassword" />
-					<xsd:element name="identificativoDominio" type="ppt:stText35" minOccurs="0" />
+					<xsd:element name="identificativoDominio" type="ppt:stText35"  />
 					<xsd:element name="identificativoPSP" type="ppt:stText35" minOccurs="0" />
 					<xsd:element name="identificativoFlusso" type="xsd:string" />
 				</xsd:sequence>
@@ -554,7 +554,7 @@
 				</xsd:complexContent>
 			</xsd:complexType>
 		</xsd:schema>
-    </wsdl:types>
+	</wsdl:types>
 	<wsdl:message name="nodoChiediStatoRPT">
 		<wsdl:part name="bodyrichiesta" element="ppt:nodoChiediStatoRPT">
 		</wsdl:part>

diff --git a/jars/pagopa-beans/src/main/resources/wsdl/PaPerNodo.wsdl b/jars/pagopa-beans/src/main/resources/wsdl/PaPerNodo.wsdl
@@ -3,16 +3,16 @@
   Questo WSDL rappresenta l'interfaccia esposta dalla PAA
   per la ricezione delle Ricevute Telematiche
 -->
-<wsdl:definitions 
-	xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" 
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-	xmlns:ppt="http://ws.pagamenti.telematici.gov/" 
-	xmlns:ppthead="http://ws.pagamenti.telematici.gov/ppthead" 
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-	xmlns:tns="http://NodoPagamentiSPC.spcoop.gov.it/servizi/PagamentiTelematiciRT"
-	name="PPT" 
-	targetNamespace="http://NodoPagamentiSPC.spcoop.gov.it/servizi/PagamentiTelematiciRT">
+<wsdl:definitions
+		xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata"
+		xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+		xmlns:ppt="http://ws.pagamenti.telematici.gov/"
+		xmlns:ppthead="http://ws.pagamenti.telematici.gov/ppthead"
+		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+		xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+		xmlns:tns="http://NodoPagamentiSPC.spcoop.gov.it/servizi/PagamentiTelematiciRT"
+		name="PPT"
+		targetNamespace="http://NodoPagamentiSPC.spcoop.gov.it/servizi/PagamentiTelematiciRT">
 	<wsdl:types>
 		<xsd:schema version="2.1" targetNamespace="http://ws.pagamenti.telematici.gov/ppthead">
 			<xsd:simpleType name="stText35">
@@ -50,13 +50,13 @@
 			<!-- Wrapper Elements -->
 			<xsd:element name="paaInviaRT" type="ppt:paaInviaRT" />
 			<xsd:element name="paaInviaRTRisposta" type="ppt:paaInviaRTRisposta" />
-			
+
 			<xsd:element name="paaInviaEsitoStorno" type="ppt:paaInviaEsitoStorno" />
 			<xsd:element name="paaInviaEsitoStornoRisposta" type="ppt:paaInviaEsitoStornoRisposta" />
-			
+
 			<xsd:element name="paaInviaRichiestaRevoca" type="ppt:paaInviaRichiestaRevoca" />
 			<xsd:element name="paaInviaRichiestaRevocaRisposta" type="ppt:paaInviaRichiestaRevocaRisposta" />
-			
+
 			<!-- Element Definition -->
 			<xsd:complexType name="paaInviaRT">
 				<xsd:sequence>
@@ -90,12 +90,13 @@
 					<xsd:element name="id" type="xsd:string" />
 					<xsd:element name="description" type="xsd:string" minOccurs="0" />
 					<xsd:element name="serial" type="xsd:int" minOccurs="0" />
-					<xsd:element name="originalFaultCode" type="xsd:string"  minOccurs="0"  />
-					<xsd:element name="originalFaultString" type="xsd:string"  minOccurs="0"  />
-					<xsd:element name="originalDescription" type="xsd:string" minOccurs="0" />
+					<!--  Commentati campi aggiuntivi fault. Non necessari e da verificare che il Nodo li accetti -->
+					<!--	<xsd:element name="originalFaultCode" type="xsd:string"  minOccurs="0"  /> -->
+					<!--	<xsd:element name="originalFaultString" type="xsd:string"  minOccurs="0"  /> -->
+					<!--	<xsd:element name="originalDescription" type="xsd:string" minOccurs="0" /> -->
 				</xsd:sequence>
 			</xsd:complexType>
-			
+
 			<xsd:complexType name="paaInviaEsitoStorno">
 				<xsd:sequence>
 					<xsd:element name="identificativoIntermediarioPA" type="ppt:stText35" />
@@ -106,13 +107,13 @@
 					<xsd:element name="er" type="xsd:base64Binary" />
 				</xsd:sequence>
 			</xsd:complexType>
-			
+
 			<xsd:complexType name="paaInviaEsitoStornoRisposta">
 				<xsd:sequence>
 					<xsd:element name="paaInviaEsitoStornoRisposta" type="ppt:tipoInviaEsitoStornoRisposta" />
 				</xsd:sequence>
 			</xsd:complexType>
-			
+
 			<xsd:complexType name="tipoInviaEsitoStornoRisposta">
 				<xsd:complexContent>
 					<xsd:extension base="ppt:risposta">
@@ -122,7 +123,7 @@
 					</xsd:extension>
 				</xsd:complexContent>
 			</xsd:complexType>
-			
+
 			<xsd:complexType name="paaInviaRichiestaRevoca">
 				<xsd:sequence>
 					<xsd:element name="identificativoDominio" type="ppt:stText35" />
@@ -131,13 +132,13 @@
 					<xsd:element name="rr" type="xsd:base64Binary" />
 				</xsd:sequence>
 			</xsd:complexType>
-			
+
 			<xsd:complexType name="paaInviaRichiestaRevocaRisposta">
 				<xsd:sequence>
 					<xsd:element name="paaInviaRichiestaRevocaRisposta" type="ppt:tipoInviaRichiestaRevocaRisposta" />
 				</xsd:sequence>
 			</xsd:complexType>
-			
+
 			<xsd:complexType name="tipoInviaRichiestaRevocaRisposta">
 				<xsd:complexContent>
 					<xsd:extension base="ppt:risposta">
@@ -148,7 +149,7 @@
 				</xsd:complexContent>
 			</xsd:complexType>
 		</xsd:schema>
-    </wsdl:types>
+	</wsdl:types>
 	<wsdl:message name="paaInviaRT">
 		<wsdl:part name="bodyrichiesta" element="ppt:paaInviaRT" />
 		<wsdl:part name="header" element="ppthead:intestazionePPT" />