From a2b1df739eefaa4babd7f67f905a18127135b94d Mon Sep 17 00:00:00 2001 From: Thomas <> Date: Wed, 7 Jun 2023 08:56:30 +0200 Subject: feat(srz): switch to new SZR WSDL v4.1(2023) that implements "Meldegesetznovelle 2023) --- .../auth/eidas/v2/clients/szr/SzrClient.java | 6 +- .../auth/eidas/v2/clients/szr/SzrService.java | 106 +++++++++++---------- 2 files changed, 57 insertions(+), 55 deletions(-) (limited to 'modules/authmodule-eIDAS-v2/src/main/java') diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/szr/SzrClient.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/szr/SzrClient.java index c9c3a2fa..39b34757 100644 --- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/szr/SzrClient.java +++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/szr/SzrClient.java @@ -308,7 +308,7 @@ public class SzrClient extends AbstractSoapClient { @PostConstruct private void initialize() throws EaafConfigurationException { log.info("Starting SZR-Client initialization .... "); - final URL url = SzrClient.class.getResource("/wsdl/szr_client/SZR_v4.0.wsdl"); + final URL url = SzrClient.class.getResource("/wsdl/szr_client/SZR_v4.1.wsdl"); final boolean useTestSzr = basicConfig.getBasicConfigurationBoolean( Constants.CONIG_PROPS_EIDAS_SZRCLIENT_USETESTSERVICE, @@ -319,9 +319,9 @@ public class SzrClient extends AbstractSoapClient { String szrUrl; if (useTestSzr) { log.debug("Initializing SZR test environment configuration."); - qname = SzrService.SZRTestumgebung; + qname = SzrService.SZRExterneTestumgebung; szrService = new SzrService(url, new QName("urn:SZRServices", "SZRService")); - szr = szrService.getSzrTestumgebung(); + szr = szrService.getSzrExterneTestumgebung(); szrUrl = basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_SZRCLIENT_ENDPOINT_TEST); } else { diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/szr/SzrService.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/szr/SzrService.java index 590f88a4..1f7956cc 100644 --- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/szr/SzrService.java +++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/szr/SzrService.java @@ -1,26 +1,3 @@ -/* - * Copyright 2018 A-SIT Plus GmbH - * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, - * A-SIT Plus GmbH, A-SIT, and Graz University of Technology. - * - * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by - * the European Commission - subsequent versions of the EUPL (the "License"); - * You may not use this work except in compliance with the License. - * You may obtain a copy of the License at: - * https://joinup.ec.europa.eu/news/understanding-eupl-v12 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * This product combines work with different licenses. See the "NOTICE" text - * file for details on the various modules and licenses. - * The "NOTICE" text file is part of the distribution. Any derivative works - * that you distribute must include a readable copy of the "NOTICE" text file. -*/ - package at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.szr; import java.net.URL; @@ -34,32 +11,33 @@ import javax.xml.ws.WebServiceFeature; import szrservices.SZR; /** - * This class was generated by Apache CXF 3.1.16 2018-07-10T09:36:01.466+02:00 - * Generated source version: 3.1.16 + * This class was generated by Apache CXF 3.5.6 2023-06-06T17:56:53.794+02:00 + * Generated source version: 3.5.6 * */ @WebServiceClient(name = "SZRService", - wsdlLocation = "./src/main/resources/szr_client/SZR-1.WSDL", + wsdlLocation = "/wsdl/szr_client/SZR_v4.1.wsdl", targetNamespace = "urn:SZRServices") public class SzrService extends Service { public static final URL WSDL_LOCATION; public static final QName SERVICE = new QName("urn:SZRServices", "SZRService"); + public static final QName SZRInterneTestumgebung = new QName("urn:SZRServices", "SZRInterneTestumgebung"); public static final QName SZRProduktionsumgebung = new QName("urn:SZRServices", "SZRProduktionsumgebung"); - public static final QName SZRTestumgebung = new QName("urn:SZRServices", "SZRTestumgebung"); public static final QName SZRBusinesspartnerTestumgebung = new QName("urn:SZRServices", "SZRBusinesspartnerTestumgebung"); - + public static final QName SZRExterneTestumgebung = new QName("urn:SZRServices", "SZRExterneTestumgebung"); + static { - URL url = SzrService.class.getResource("./src/main/resources/wsdl/szr_client/SZR-1.WSDL"); + URL url = SzrService.class.getResource("./src/main/resources/wsdl/szr_client/SZR_v4.1.wsdlL"); if (url == null) { - url = SzrService.class.getClassLoader().getResource("/szr_client/SZR-1.WSDL"); + url = SzrService.class.getClassLoader().getResource("/wsdl/szr_client/SZR_v4.1.wsdl"); } if (url == null) { java.util.logging.Logger.getLogger(SzrService.class.getName()) .log(java.util.logging.Level.INFO, - "Can not initialize the default wsdl from {0}", "/szr_client/SZR-1.WSDL"); + "Can not initialize the default wsdl from {0}", "/wsdl/szr_client/SZR_v4.1.wsdl"); } WSDL_LOCATION = url; @@ -90,17 +68,17 @@ public class SzrService extends Service { } /** - * Get SZR Web-Service. - * + * Get SZR WebService Client. + * * @return returns SZR */ - @WebEndpoint(name = "SZRProduktionsumgebung") - public SZR getSzrProduktionsumgebung() { - return super.getPort(SZRProduktionsumgebung, SZR.class); + @WebEndpoint(name = "SZRInterneTestumgebung") + public SZR getSzrInterneTestumgebung() { + return super.getPort(SZRInterneTestumgebung, SZR.class); } /** - * Get SZR Web-Service. + * Get SZR WebService Client. * * @param features A list of {@link javax.xml.ws.WebServiceFeature} to configure * on the proxy. Supported features not in the @@ -108,23 +86,23 @@ public class SzrService extends Service { * values. * @return returns SZR */ - @WebEndpoint(name = "SZRProduktionsumgebung") - public SZR getSzrProduktionsumgebung(WebServiceFeature... features) { - return super.getPort(SZRProduktionsumgebung, SZR.class, features); + @WebEndpoint(name = "SZRInterneTestumgebung") + public SZR getSzrInterneTestumgebung(WebServiceFeature... features) { + return super.getPort(SZRInterneTestumgebung, SZR.class, features); } /** - *Get SZR Web-Service. - * + * Get SZR WebService Client. + * * @return returns SZR */ - @WebEndpoint(name = "SZRTestumgebung") - public SZR getSzrTestumgebung() { - return super.getPort(SZRTestumgebung, SZR.class); + @WebEndpoint(name = "SZRProduktionsumgebung") + public SZR getSzrProduktionsumgebung() { + return super.getPort(SZRProduktionsumgebung, SZR.class); } /** - * Get SZR Web-Service. + * Get SZR WebService Client. * * @param features A list of {@link javax.xml.ws.WebServiceFeature} to configure * on the proxy. Supported features not in the @@ -132,14 +110,14 @@ public class SzrService extends Service { * values. * @return returns SZR */ - @WebEndpoint(name = "SZRTestumgebung") - public SZR getSzrTestumgebung(WebServiceFeature... features) { - return super.getPort(SZRTestumgebung, SZR.class, features); + @WebEndpoint(name = "SZRProduktionsumgebung") + public SZR getSzrProduktionsumgebung(WebServiceFeature... features) { + return super.getPort(SZRProduktionsumgebung, SZR.class, features); } /** - * Get SZR Web-Service. - * + * Get SZR WebService Client. + * * @return returns SZR */ @WebEndpoint(name = "SZRBusinesspartnerTestumgebung") @@ -148,7 +126,7 @@ public class SzrService extends Service { } /** - * Get SZR Web-Service. + * Get SZR WebService Client. * * @param features A list of {@link javax.xml.ws.WebServiceFeature} to configure * on the proxy. Supported features not in the @@ -161,4 +139,28 @@ public class SzrService extends Service { return super.getPort(SZRBusinesspartnerTestumgebung, SZR.class, features); } + /** + * Get SZR WebService Client. + * + * @return returns SZR + */ + @WebEndpoint(name = "SZRExterneTestumgebung") + public SZR getSzrExterneTestumgebung() { + return super.getPort(SZRExterneTestumgebung, SZR.class); + } + + /** + * Get SZR WebService Client. + * + * @param features A list of {@link javax.xml.ws.WebServiceFeature} to configure + * on the proxy. Supported features not in the + * features parameter will have their default + * values. + * @return returns SZR + */ + @WebEndpoint(name = "SZRExterneTestumgebung") + public SZR getSzrExterneTestumgebung(WebServiceFeature... features) { + return super.getPort(SZRExterneTestumgebung, SZR.class, features); + } + } -- cgit v1.2.3