Skip to content

Commit 9697373

Browse files
parerworkerparerworker
committed
Update project to latest tag preingest-xml-3.4.0
1 parent d91a94e commit 9697373

7 files changed

Lines changed: 213 additions & 174 deletions

File tree

‎pom.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<parent>
55
<groupId>it.eng.parer</groupId>
66
<artifactId>parer-pom</artifactId>
7-
<version>6.4.1</version>
7+
<version>7.2.0</version>
88
</parent>
99
<artifactId>preingest-xml</artifactId>
10-
<version>3.3.1-SNAPSHOT</version>
10+
<version>3.4.0</version>
1111
<name>preingest-xml</name>
1212
<description>Progetto PREINGEST-XML</description>
1313

@@ -34,8 +34,7 @@
3434
<sonar.projectVersion>${project.version}</sonar.projectVersion>
3535
<!-- Skiptests by default : esecuzione su CI -->
3636
<skipTests>true</skipTests>
37-
<!-- <junit-jupiter.version>5.10.3</junit-jupiter.version>-->
38-
<junit-jupiter.version>5.9.2</junit-jupiter.version>
37+
<junit-jupiter.version>5.14.3</junit-jupiter.version>
3938
<jaxb2-maven-plugin.version>2.5.0</jaxb2-maven-plugin.version>
4039
</properties>
4140

‎src/main/java/it/eng/sacerasixml/xsd/FileXSD.java‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
/*
22
* Engineering Ingegneria Informatica S.p.A.
33
*
4-
* Copyright (C) 2023 Regione Emilia-Romagna
5-
* <p/>
6-
* This program is free software: you can redistribute it and/or modify it under the terms of
7-
* the GNU Affero General Public License as published by the Free Software Foundation,
8-
* either version 3 of the License, or (at your option) any later version.
9-
* <p/>
10-
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
11-
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
12-
* See the GNU Affero General Public License for more details.
13-
* <p/>
14-
* You should have received a copy of the GNU Affero General Public License along with this program.
15-
* If not, see <https://www.gnu.org/licenses/>.
4+
* Copyright (C) 2023 Regione Emilia-Romagna <p/> This program is free software: you can
5+
* redistribute it and/or modify it under the terms of the GNU Affero General Public License as
6+
* published by the Free Software Foundation, either version 3 of the License, or (at your option)
7+
* any later version. <p/> This program is distributed in the hope that it will be useful, but
8+
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
9+
* PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. <p/> You should
10+
* have received a copy of the GNU Affero General Public License along with this program. If not,
11+
* see <https://www.gnu.org/licenses/>.
1612
*/
1713

1814
package it.eng.sacerasixml.xsd;
@@ -24,10 +20,12 @@
2420
public enum FileXSD {
2521
INVIO_ASYNC_XSD("/xsd/it/eng/sacerasi/ws/xml/invioAsync/WSInvioAsync.xsd"),
2622
DATI_SPEC_DICOM_XSD("/xsd/it/eng/sacerasi/ws/xml/datiSpecDicom/WSMetadatiSpecificiDICOM.xsd"),
27-
DATI_SPEC_RESULT_XSD("/xsd/it/eng/sacerasi/ws/xml/datiSpecResult/WSDatiSpecificiDiarioResult.xsd"),
23+
DATI_SPEC_RESULT_XSD(
24+
"/xsd/it/eng/sacerasi/ws/xml/datiSpecResult/WSDatiSpecificiDiarioResult.xsd"),
2825
DATI_SPEC_OUT_XSD("/xsd/it/eng/sacerasi/ws/xml/datiSpecOut/WSDatiSpecificiDiarioOut.xsd"),
2926
DATI_SPEC_ORDER_XSD("/xsd/it/eng/sacerasi/ws/xml/datiSpecOrder/WSDatiSpecificiDiarioOrder.xsd"),
30-
DATI_SPEC_FILTRI_XSD("/xsd/it/eng/sacerasi/ws/xml/datiSpecFiltri/WSDatiSpecificiDiarioFiltri.xsd"),
27+
DATI_SPEC_FILTRI_XSD(
28+
"/xsd/it/eng/sacerasi/ws/xml/datiSpecFiltri/WSDatiSpecificiDiarioFiltri.xsd"),
3129
INVIO_DA_TRASF_XSD("/xsd/it/eng/sacerasi/ws/xml/invioDaTrasf/WSInvioDaTrasf.xsd"),
3230
INVIO_SU_XSD("/xsd/it/eng/sacerasi/su/xml/invioSU/InvioSU.xsd"),
3331
INVIO_SISMA_XSD("/xsd/it/eng/sacerasi/sisma/xml/invioSisma/InvioSisma.xsd"),

‎src/main/java/it/eng/sacerasixml/xsd/FileXSDUtil.java‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
/*
22
* Engineering Ingegneria Informatica S.p.A.
33
*
4-
* Copyright (C) 2023 Regione Emilia-Romagna
5-
* <p/>
6-
* This program is free software: you can redistribute it and/or modify it under the terms of
7-
* the GNU Affero General Public License as published by the Free Software Foundation,
8-
* either version 3 of the License, or (at your option) any later version.
9-
* <p/>
10-
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
11-
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
12-
* See the GNU Affero General Public License for more details.
13-
* <p/>
14-
* You should have received a copy of the GNU Affero General Public License along with this program.
15-
* If not, see <https://www.gnu.org/licenses/>.
4+
* Copyright (C) 2023 Regione Emilia-Romagna <p/> This program is free software: you can
5+
* redistribute it and/or modify it under the terms of the GNU Affero General Public License as
6+
* published by the Free Software Foundation, either version 3 of the License, or (at your option)
7+
* any later version. <p/> This program is distributed in the hope that it will be useful, but
8+
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
9+
* PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. <p/> You should
10+
* have received a copy of the GNU Affero General Public License along with this program. If not,
11+
* see <https://www.gnu.org/licenses/>.
1612
*/
1713

1814
package it.eng.sacerasixml.xsd;

‎src/main/java/it/eng/sacerasixml/xsd/util/NamespaceFilterForUnmashal.java‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
/*
22
* Engineering Ingegneria Informatica S.p.A.
33
*
4-
* Copyright (C) 2023 Regione Emilia-Romagna
5-
* <p/>
6-
* This program is free software: you can redistribute it and/or modify it under the terms of
7-
* the GNU Affero General Public License as published by the Free Software Foundation,
8-
* either version 3 of the License, or (at your option) any later version.
9-
* <p/>
10-
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
11-
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
12-
* See the GNU Affero General Public License for more details.
13-
* <p/>
14-
* You should have received a copy of the GNU Affero General Public License along with this program.
15-
* If not, see <https://www.gnu.org/licenses/>.
4+
* Copyright (C) 2023 Regione Emilia-Romagna <p/> This program is free software: you can
5+
* redistribute it and/or modify it under the terms of the GNU Affero General Public License as
6+
* published by the Free Software Foundation, either version 3 of the License, or (at your option)
7+
* any later version. <p/> This program is distributed in the hope that it will be useful, but
8+
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
9+
* PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. <p/> You should
10+
* have received a copy of the GNU Affero General Public License along with this program. If not,
11+
* see <https://www.gnu.org/licenses/>.
1612
*/
1713

1814
package it.eng.sacerasixml.xsd.util;
@@ -35,7 +31,8 @@ public class NamespaceFilterForUnmashal extends XMLFilterImpl {
3531
private SAXConnector saxConnector;
3632

3733
@Override
38-
public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
34+
public void startElement(String uri, String localName, String qName, Attributes atts)
35+
throws SAXException {
3936

4037
if (saxConnector != null) {
4138
Collection<QName> expected = saxConnector.getContext().getCurrentExpectedElements();

‎src/main/java/it/eng/sacerasixml/xsd/util/Utils.java‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,19 @@
11
/*
22
* Engineering Ingegneria Informatica S.p.A.
33
*
4-
* Copyright (C) 2023 Regione Emilia-Romagna
5-
* <p/>
6-
* This program is free software: you can redistribute it and/or modify it under the terms of
7-
* the GNU Affero General Public License as published by the Free Software Foundation,
8-
* either version 3 of the License, or (at your option) any later version.
9-
* <p/>
10-
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
11-
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
12-
* See the GNU Affero General Public License for more details.
13-
* <p/>
14-
* You should have received a copy of the GNU Affero General Public License along with this program.
15-
* If not, see <https://www.gnu.org/licenses/>.
4+
* Copyright (C) 2023 Regione Emilia-Romagna <p/> This program is free software: you can
5+
* redistribute it and/or modify it under the terms of the GNU Affero General Public License as
6+
* published by the Free Software Foundation, either version 3 of the License, or (at your option)
7+
* any later version. <p/> This program is distributed in the hope that it will be useful, but
8+
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
9+
* PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. <p/> You should
10+
* have received a copy of the GNU Affero General Public License along with this program. If not,
11+
* see <https://www.gnu.org/licenses/>.
1612
*/
1713

1814
/*
19-
* To change this license header, choose License Headers in Project Properties.
20-
* To change this template file, choose Tools | Templates
21-
* and open the template in the editor.
15+
* To change this license header, choose License Headers in Project Properties. To change this
16+
* template file, choose Tools | Templates and open the template in the editor.
2217
*/
2318
package it.eng.sacerasixml.xsd.util;
2419

@@ -46,10 +41,11 @@ public static String getStandardXsDateFormat(Date data) {
4641
}
4742

4843
/*
49-
* Metodo che consente di ignorare i namespace multipli all'interno di un xml passato dalle applicazioni. Senza
50-
* questo filtro JAXB esplode con gli XML che vengono passati.
44+
* Metodo che consente di ignorare i namespace multipli all'interno di un xml passato dalle
45+
* applicazioni. Senza questo filtro JAXB esplode con gli XML che vengono passati.
5146
*/
52-
public static Source getSaxSourceForUnmarshal(String datiXml) throws SAXException, ParserConfigurationException {
47+
public static Source getSaxSourceForUnmarshal(String datiXml)
48+
throws SAXException, ParserConfigurationException {
5349
final SAXParserFactory sax = SAXParserFactory.newInstance();
5450
sax.setNamespaceAware(true);
5551
final XMLReader xmlReader = sax.newSAXParser().getXMLReader();

‎src/main/resources/xsd/it/eng/sacerasi/su/xml/invioSU/InvioSU.xsd‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,8 @@
205205
<xs:enumeration value="CHIUSURA"/>
206206
<xs:enumeration value="PROPOSTA"/>
207207
<xs:enumeration value="STIPULA"/>
208+
<xs:enumeration value="BURERT DI PUBBLICAZIONE"/>
209+
<xs:enumeration value="PROTOCOLLAZIONE DELLA COMUNICAZIONE DI AVVENUTO VERSAMENTO"/>
208210
</xs:restriction>
209211
</xs:simpleType>
210212
</xs:element>

0 commit comments

Comments
 (0)