diff --git a/bzst-dip-java-client/pom.xml b/bzst-dip-java-client/pom.xml index 26f97a15..c50b676c 100644 --- a/bzst-dip-java-client/pom.xml +++ b/bzst-dip-java-client/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 software.xdev diff --git a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/api/MdEinreichenProviderApi.java b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/api/MdEinreichenProviderApi.java deleted file mode 100644 index edc27024..00000000 --- a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/api/MdEinreichenProviderApi.java +++ /dev/null @@ -1,700 +0,0 @@ -/* - * dip-mds - * DIP-Massendatenschnittstelle - * - * The version of the OpenAPI document: DIP-MDS 1.3 - * - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - -package software.xdev.bzst.dip.client.generated.api; - -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.StringJoiner; - -import com.fasterxml.jackson.core.type.TypeReference; - -import software.xdev.bzst.dip.client.generated.client.ApiClient; -import software.xdev.bzst.dip.client.generated.client.ApiException; -import software.xdev.bzst.dip.client.generated.client.BaseApi; -import software.xdev.bzst.dip.client.generated.client.Configuration; -import software.xdev.bzst.dip.client.generated.client.Pair; - -public class MdEinreichenProviderApi extends BaseApi { - - public MdEinreichenProviderApi() { - super(Configuration.getDefaultApiClient()); - } - - public MdEinreichenProviderApi(final ApiClient apiClient) { - super(apiClient); - } - - /** - * Abruf einer Liste aller Datentransfernummern mit verfügbarem Protokoll - * Abruf einer Liste aller Datentransfernummern mit verfügbarem Protokoll - * @param authorization (optional) - * @return InputStream - * @throws ApiException if fails to make API call - */ - public InputStream alleProtokollnummern(final String authorization) throws ApiException { - return this.alleProtokollnummern(authorization, Collections.emptyMap()); - } - - - /** - * Abruf einer Liste aller Datentransfernummern mit verfügbarem Protokoll - * Abruf einer Liste aller Datentransfernummern mit verfügbarem Protokoll - * @param authorization (optional) - * @param additionalHeaders additionalHeaders for this call - * @return InputStream - * @throws ApiException if fails to make API call - */ - public InputStream alleProtokollnummern(final String authorization, final Map additionalHeaders) throws ApiException { - final Object localVarPostBody = null; - - // create path and map variables - final String localVarPath = "/dip/md/protocolnumbers"; - - final StringJoiner localVarQueryStringJoiner = new StringJoiner("&"); - String localVarQueryParameterBaseName; - final List localVarQueryParams = new ArrayList<>(); - final List localVarCollectionQueryParams = new ArrayList<>(); - final Map localVarHeaderParams = new HashMap<>(); - final Map localVarCookieParams = new HashMap<>(); - final Map localVarFormParams = new HashMap<>(); - - if (authorization != null) - localVarHeaderParams.put("Authorization", this.apiClient.parameterToString(authorization)); - - localVarHeaderParams.putAll(additionalHeaders); - - - - final String[] localVarAccepts = { - "application/octet-stream" - }; - final String localVarAccept = this.apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = this.apiClient.selectHeaderContentType(localVarContentTypes); - - final String[] localVarAuthNames = new String[] { }; - - final TypeReference localVarReturnType = new TypeReference<>() - { - }; - return this.apiClient.invokeAPI( - localVarPath, - "GET", - localVarQueryParams, - localVarCollectionQueryParams, - localVarQueryStringJoiner.toString(), - localVarPostBody, - localVarHeaderParams, - localVarCookieParams, - localVarFormParams, - localVarAccept, - localVarContentType, - localVarAuthNames, - localVarReturnType - ); - } - - /** - * Einreichung zusätzlicher Anhänge - * Einreichung zusätzlicher Anhänge unter Angabe einer Datentransfernummer - * @param datentransfernummer Die Datentransfernummer, die die Transaktion identifiziert (required) - * @param authorization (optional) - * @param body Einreichung zusätzlicher Anhänge unter Angabe einer Datentransfernummer (optional) - * @throws ApiException if fails to make API call - */ - public void anhangEinreichen(final String datentransfernummer, final String authorization, final InputStream body) throws ApiException { - this.anhangEinreichen(datentransfernummer, authorization, body, Collections.emptyMap()); - } - - - /** - * Einreichung zusätzlicher Anhänge - * Einreichung zusätzlicher Anhänge unter Angabe einer Datentransfernummer - * @param datentransfernummer Die Datentransfernummer, die die Transaktion identifiziert (required) - * @param authorization (optional) - * @param body Einreichung zusätzlicher Anhänge unter Angabe einer Datentransfernummer (optional) - * @param additionalHeaders additionalHeaders for this call - * @throws ApiException if fails to make API call - */ - public void anhangEinreichen(final String datentransfernummer, final String authorization, final InputStream body, final Map additionalHeaders) throws ApiException { - final Object localVarPostBody = body; - - // verify the required parameter 'datentransfernummer' is set - if (datentransfernummer == null) { - throw new ApiException(400, "Missing the required parameter 'datentransfernummer' when calling anhangEinreichen"); - } - - // create path and map variables - final String localVarPath = "/dip/md/{datentransfernummer}/attachment" - .replaceAll("\\{" + "datentransfernummer" + "\\}", this.apiClient.escapeString(datentransfernummer.toString())); - - final StringJoiner localVarQueryStringJoiner = new StringJoiner("&"); - String localVarQueryParameterBaseName; - final List localVarQueryParams = new ArrayList<>(); - final List localVarCollectionQueryParams = new ArrayList<>(); - final Map localVarHeaderParams = new HashMap<>(); - final Map localVarCookieParams = new HashMap<>(); - final Map localVarFormParams = new HashMap<>(); - - if (authorization != null) - localVarHeaderParams.put("Authorization", this.apiClient.parameterToString(authorization)); - - localVarHeaderParams.putAll(additionalHeaders); - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = this.apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/octet-stream" - }; - final String localVarContentType = this.apiClient.selectHeaderContentType(localVarContentTypes); - - final String[] localVarAuthNames = new String[] { }; - - this.apiClient.invokeAPI( - localVarPath, - "PUT", - localVarQueryParams, - localVarCollectionQueryParams, - localVarQueryStringJoiner.toString(), - localVarPostBody, - localVarHeaderParams, - localVarCookieParams, - localVarFormParams, - localVarAccept, - localVarContentType, - localVarAuthNames, - null - ); - } - - /** - * Abbruch der laufenden Übertragung und Verwerfen der bisher übertragenen Dateien - * Verkünden der Absicht, die laufende Massendatenlieferung abzubrechen und die übertragenen Dateien zu verwerfen - * @param datentransfernummer Die Datentransfernummer, die die Transaktion identifiziert (required) - * @param authorization (optional) - * @throws ApiException if fails to make API call - */ - public void einreichungAbbrechen(final String datentransfernummer, final String authorization) throws ApiException { - this.einreichungAbbrechen(datentransfernummer, authorization, Collections.emptyMap()); - } - - - /** - * Abbruch der laufenden Übertragung und Verwerfen der bisher übertragenen Dateien - * Verkünden der Absicht, die laufende Massendatenlieferung abzubrechen und die übertragenen Dateien zu verwerfen - * @param datentransfernummer Die Datentransfernummer, die die Transaktion identifiziert (required) - * @param authorization (optional) - * @param additionalHeaders additionalHeaders for this call - * @throws ApiException if fails to make API call - */ - public void einreichungAbbrechen(final String datentransfernummer, final String authorization, final Map additionalHeaders) throws ApiException { - final Object localVarPostBody = null; - - // verify the required parameter 'datentransfernummer' is set - if (datentransfernummer == null) { - throw new ApiException(400, "Missing the required parameter 'datentransfernummer' when calling einreichungAbbrechen"); - } - - // create path and map variables - final String localVarPath = "/dip/md/{datentransfernummer}/abort" - .replaceAll("\\{" + "datentransfernummer" + "\\}", this.apiClient.escapeString(datentransfernummer.toString())); - - final StringJoiner localVarQueryStringJoiner = new StringJoiner("&"); - String localVarQueryParameterBaseName; - final List localVarQueryParams = new ArrayList<>(); - final List localVarCollectionQueryParams = new ArrayList<>(); - final Map localVarHeaderParams = new HashMap<>(); - final Map localVarCookieParams = new HashMap<>(); - final Map localVarFormParams = new HashMap<>(); - - if (authorization != null) - localVarHeaderParams.put("Authorization", this.apiClient.parameterToString(authorization)); - - localVarHeaderParams.putAll(additionalHeaders); - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = this.apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = this.apiClient.selectHeaderContentType(localVarContentTypes); - - final String[] localVarAuthNames = new String[] { }; - - this.apiClient.invokeAPI( - localVarPath, - "PATCH", - localVarQueryParams, - localVarCollectionQueryParams, - localVarQueryStringJoiner.toString(), - localVarPostBody, - localVarHeaderParams, - localVarCookieParams, - localVarFormParams, - localVarAccept, - localVarContentType, - localVarAuthNames, - null - ); - } - - /** - * Anfordern einer Datentransfernummer und Einleiten einer Massendatenlieferung - * Anfordern einer Datentransfernummer zur Identifikation der Lieferung und Einleiten einer Massendatenlieferung - * @param fachverfahren Das Ziel-Fachverfahren (required) - * @param authorization (optional) - * @return String - * @throws ApiException if fails to make API call - */ - public String einreichungAnmelden(final String fachverfahren, final String authorization) throws ApiException { - return this.einreichungAnmelden(fachverfahren, authorization, Collections.emptyMap()); - } - - - /** - * Anfordern einer Datentransfernummer und Einleiten einer Massendatenlieferung - * Anfordern einer Datentransfernummer zur Identifikation der Lieferung und Einleiten einer Massendatenlieferung - * @param fachverfahren Das Ziel-Fachverfahren (required) - * @param authorization (optional) - * @param additionalHeaders additionalHeaders for this call - * @return String - * @throws ApiException if fails to make API call - */ - public String einreichungAnmelden(final String fachverfahren, final String authorization, final Map additionalHeaders) throws ApiException { - final Object localVarPostBody = null; - - // verify the required parameter 'fachverfahren' is set - if (fachverfahren == null) { - throw new ApiException(400, "Missing the required parameter 'fachverfahren' when calling einreichungAnmelden"); - } - - // create path and map variables - final String localVarPath = "/dip/start/{fachverfahren}" - .replaceAll("\\{" + "fachverfahren" + "\\}", this.apiClient.escapeString(fachverfahren.toString())); - - final StringJoiner localVarQueryStringJoiner = new StringJoiner("&"); - String localVarQueryParameterBaseName; - final List localVarQueryParams = new ArrayList<>(); - final List localVarCollectionQueryParams = new ArrayList<>(); - final Map localVarHeaderParams = new HashMap<>(); - final Map localVarCookieParams = new HashMap<>(); - final Map localVarFormParams = new HashMap<>(); - - if (authorization != null) - localVarHeaderParams.put("Authorization", this.apiClient.parameterToString(authorization)); - - localVarHeaderParams.putAll(additionalHeaders); - - - - final String[] localVarAccepts = { - "text/plain" - }; - final String localVarAccept = this.apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = this.apiClient.selectHeaderContentType(localVarContentTypes); - - final String[] localVarAuthNames = new String[] { }; - - final TypeReference localVarReturnType = new TypeReference<>() - { - }; - return this.apiClient.invokeAPI( - localVarPath, - "POST", - localVarQueryParams, - localVarCollectionQueryParams, - localVarQueryStringJoiner.toString(), - localVarPostBody, - localVarHeaderParams, - localVarCookieParams, - localVarFormParams, - localVarAccept, - localVarContentType, - localVarAuthNames, - localVarReturnType - ); - } - - /** - * Erklärung, dass die Massendatenlieferung abgeschlossen ist - * Erklärung der Fertigstellung der Massendatenlieferung - * @param datentransfernummer Die Datentransfernummer, die die Transaktion identifiziert (required) - * @param authorization (optional) - * @throws ApiException if fails to make API call - */ - public void einreichungBeenden(final String datentransfernummer, final String authorization) throws ApiException { - this.einreichungBeenden(datentransfernummer, authorization, Collections.emptyMap()); - } - - - /** - * Erklärung, dass die Massendatenlieferung abgeschlossen ist - * Erklärung der Fertigstellung der Massendatenlieferung - * @param datentransfernummer Die Datentransfernummer, die die Transaktion identifiziert (required) - * @param authorization (optional) - * @param additionalHeaders additionalHeaders for this call - * @throws ApiException if fails to make API call - */ - public void einreichungBeenden(final String datentransfernummer, final String authorization, final Map additionalHeaders) throws ApiException { - final Object localVarPostBody = null; - - // verify the required parameter 'datentransfernummer' is set - if (datentransfernummer == null) { - throw new ApiException(400, "Missing the required parameter 'datentransfernummer' when calling einreichungBeenden"); - } - - // create path and map variables - final String localVarPath = "/dip/md/{datentransfernummer}/finish" - .replaceAll("\\{" + "datentransfernummer" + "\\}", this.apiClient.escapeString(datentransfernummer.toString())); - - final StringJoiner localVarQueryStringJoiner = new StringJoiner("&"); - String localVarQueryParameterBaseName; - final List localVarQueryParams = new ArrayList<>(); - final List localVarCollectionQueryParams = new ArrayList<>(); - final Map localVarHeaderParams = new HashMap<>(); - final Map localVarCookieParams = new HashMap<>(); - final Map localVarFormParams = new HashMap<>(); - - if (authorization != null) - localVarHeaderParams.put("Authorization", this.apiClient.parameterToString(authorization)); - - localVarHeaderParams.putAll(additionalHeaders); - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = this.apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = this.apiClient.selectHeaderContentType(localVarContentTypes); - - final String[] localVarAuthNames = new String[] { }; - - this.apiClient.invokeAPI( - localVarPath, - "PATCH", - localVarQueryParams, - localVarCollectionQueryParams, - localVarQueryStringJoiner.toString(), - localVarPostBody, - localVarHeaderParams, - localVarCookieParams, - localVarFormParams, - localVarAccept, - localVarContentType, - localVarAuthNames, - null - ); - } - - /** - * Einreichung des XML - * Einreichung der Daten-XML unter Angabe einer Datentransfernummer - * @param datentransfernummer Die Datentransfernummer, die die Transaktion identifiziert (required) - * @param authorization (optional) - * @param body Einreichung der Daten-XML unter Angabe einer Datentransfernummer (optional) - * @throws ApiException if fails to make API call - */ - public void massendatenEinreichen(final String datentransfernummer, final String authorization, final InputStream body) throws ApiException { - this.massendatenEinreichen(datentransfernummer, authorization, body, Collections.emptyMap()); - } - - - /** - * Einreichung des XML - * Einreichung der Daten-XML unter Angabe einer Datentransfernummer - * @param datentransfernummer Die Datentransfernummer, die die Transaktion identifiziert (required) - * @param authorization (optional) - * @param body Einreichung der Daten-XML unter Angabe einer Datentransfernummer (optional) - * @param additionalHeaders additionalHeaders for this call - * @throws ApiException if fails to make API call - */ - public void massendatenEinreichen(final String datentransfernummer, final String authorization, final InputStream body, final Map additionalHeaders) throws ApiException { - final Object localVarPostBody = body; - - // verify the required parameter 'datentransfernummer' is set - if (datentransfernummer == null) { - throw new ApiException(400, "Missing the required parameter 'datentransfernummer' when calling massendatenEinreichen"); - } - - // create path and map variables - final String localVarPath = "/dip/md/{datentransfernummer}/xml" - .replaceAll("\\{" + "datentransfernummer" + "\\}", this.apiClient.escapeString(datentransfernummer.toString())); - - final StringJoiner localVarQueryStringJoiner = new StringJoiner("&"); - String localVarQueryParameterBaseName; - final List localVarQueryParams = new ArrayList<>(); - final List localVarCollectionQueryParams = new ArrayList<>(); - final Map localVarHeaderParams = new HashMap<>(); - final Map localVarCookieParams = new HashMap<>(); - final Map localVarFormParams = new HashMap<>(); - - if (authorization != null) - localVarHeaderParams.put("Authorization", this.apiClient.parameterToString(authorization)); - - localVarHeaderParams.putAll(additionalHeaders); - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = this.apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/octet-stream" - }; - final String localVarContentType = this.apiClient.selectHeaderContentType(localVarContentTypes); - - final String[] localVarAuthNames = new String[] { }; - - this.apiClient.invokeAPI( - localVarPath, - "PUT", - localVarQueryParams, - localVarCollectionQueryParams, - localVarQueryStringJoiner.toString(), - localVarPostBody, - localVarHeaderParams, - localVarCookieParams, - localVarFormParams, - localVarAccept, - localVarContentType, - localVarAuthNames, - null - ); - } - - /** - * Abruf des Ergebnisprotokolls - * Abruf des Ergebnisprotokolls - * @param datentransfernummer Die Datentransfernummer, die die Transaktion identifiziert (required) - * @param authorization (optional) - * @return InputStream - * @throws ApiException if fails to make API call - */ - public InputStream protokollAbrufen(final String datentransfernummer, final String authorization) throws ApiException { - return this.protokollAbrufen(datentransfernummer, authorization, Collections.emptyMap()); - } - - - /** - * Abruf des Ergebnisprotokolls - * Abruf des Ergebnisprotokolls - * @param datentransfernummer Die Datentransfernummer, die die Transaktion identifiziert (required) - * @param authorization (optional) - * @param additionalHeaders additionalHeaders for this call - * @return InputStream - * @throws ApiException if fails to make API call - */ - public InputStream protokollAbrufen(final String datentransfernummer, final String authorization, final Map additionalHeaders) throws ApiException { - final Object localVarPostBody = null; - - // verify the required parameter 'datentransfernummer' is set - if (datentransfernummer == null) { - throw new ApiException(400, "Missing the required parameter 'datentransfernummer' when calling protokollAbrufen"); - } - - // create path and map variables - final String localVarPath = "/dip/md/{datentransfernummer}/protocol" - .replaceAll("\\{" + "datentransfernummer" + "\\}", this.apiClient.escapeString(datentransfernummer.toString())); - - final StringJoiner localVarQueryStringJoiner = new StringJoiner("&"); - String localVarQueryParameterBaseName; - final List localVarQueryParams = new ArrayList<>(); - final List localVarCollectionQueryParams = new ArrayList<>(); - final Map localVarHeaderParams = new HashMap<>(); - final Map localVarCookieParams = new HashMap<>(); - final Map localVarFormParams = new HashMap<>(); - - if (authorization != null) - localVarHeaderParams.put("Authorization", this.apiClient.parameterToString(authorization)); - - localVarHeaderParams.putAll(additionalHeaders); - - - - final String[] localVarAccepts = { - "application/octet-stream" - }; - final String localVarAccept = this.apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = this.apiClient.selectHeaderContentType(localVarContentTypes); - - final String[] localVarAuthNames = new String[] { }; - - final TypeReference localVarReturnType = new TypeReference<>() - { - }; - return this.apiClient.invokeAPI( - localVarPath, - "GET", - localVarQueryParams, - localVarCollectionQueryParams, - localVarQueryStringJoiner.toString(), - localVarPostBody, - localVarHeaderParams, - localVarCookieParams, - localVarFormParams, - localVarAccept, - localVarContentType, - localVarAuthNames, - localVarReturnType - ); - } - - /** - * Erhalt des Protokolls bestätigen - * Erhalt des Protokolls bestätigen - * @param datentransfernummer Die Datentransfernummer, die die Transaktion identifiziert (required) - * @param authorization (optional) - * @throws ApiException if fails to make API call - */ - public void protokollErhalten(final String datentransfernummer, final String authorization) throws ApiException { - this.protokollErhalten(datentransfernummer, authorization, Collections.emptyMap()); - } - - - /** - * Erhalt des Protokolls bestätigen - * Erhalt des Protokolls bestätigen - * @param datentransfernummer Die Datentransfernummer, die die Transaktion identifiziert (required) - * @param authorization (optional) - * @param additionalHeaders additionalHeaders for this call - * @throws ApiException if fails to make API call - */ - public void protokollErhalten(final String datentransfernummer, final String authorization, final Map additionalHeaders) throws ApiException { - final Object localVarPostBody = null; - - // verify the required parameter 'datentransfernummer' is set - if (datentransfernummer == null) { - throw new ApiException(400, "Missing the required parameter 'datentransfernummer' when calling protokollErhalten"); - } - - // create path and map variables - final String localVarPath = "/dip/md/{datentransfernummer}/protocol" - .replaceAll("\\{" + "datentransfernummer" + "\\}", this.apiClient.escapeString(datentransfernummer.toString())); - - final StringJoiner localVarQueryStringJoiner = new StringJoiner("&"); - String localVarQueryParameterBaseName; - final List localVarQueryParams = new ArrayList<>(); - final List localVarCollectionQueryParams = new ArrayList<>(); - final Map localVarHeaderParams = new HashMap<>(); - final Map localVarCookieParams = new HashMap<>(); - final Map localVarFormParams = new HashMap<>(); - - if (authorization != null) - localVarHeaderParams.put("Authorization", this.apiClient.parameterToString(authorization)); - - localVarHeaderParams.putAll(additionalHeaders); - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = this.apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = this.apiClient.selectHeaderContentType(localVarContentTypes); - - final String[] localVarAuthNames = new String[] { }; - - this.apiClient.invokeAPI( - localVarPath, - "PATCH", - localVarQueryParams, - localVarCollectionQueryParams, - localVarQueryStringJoiner.toString(), - localVarPostBody, - localVarHeaderParams, - localVarCookieParams, - localVarFormParams, - localVarAccept, - localVarContentType, - localVarAuthNames, - null - ); - } - - @Override - public T invokeAPI(final String url, final String method, final Object request, final TypeReference returnType, final Map additionalHeaders) throws ApiException { - final String localVarPath = url.replace(this.apiClient.getBaseURL(), ""); - final StringJoiner localVarQueryStringJoiner = new StringJoiner("&"); - final List localVarQueryParams = new ArrayList<>(); - final List localVarCollectionQueryParams = new ArrayList<>(); - final Map localVarHeaderParams = new HashMap<>(); - final Map localVarCookieParams = new HashMap<>(); - final Map localVarFormParams = new HashMap<>(); - - localVarHeaderParams.putAll(additionalHeaders); - - final String[] localVarAccepts = { - - }; - final String localVarAccept = this.apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = this.apiClient.selectHeaderContentType(localVarContentTypes); - - final String[] localVarAuthNames = new String[] { }; - - return this.apiClient.invokeAPI( - localVarPath, - method, - localVarQueryParams, - localVarCollectionQueryParams, - localVarQueryStringJoiner.toString(), - request, - localVarHeaderParams, - localVarCookieParams, - localVarFormParams, - localVarAccept, - localVarContentType, - localVarAuthNames, - returnType - ); - } -} diff --git a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/api/MdsProviderV21Api.java b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/api/MdsProviderV21Api.java new file mode 100644 index 00000000..85d0b603 --- /dev/null +++ b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/api/MdsProviderV21Api.java @@ -0,0 +1,793 @@ +/* + * dip-mds + * DIP-Massendatenschnittstelle + * + * The version of the OpenAPI document: DIP-MDS 2.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package software.xdev.bzst.dip.client.generated.api; + +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.StringJoiner; + +import com.fasterxml.jackson.core.type.TypeReference; + +import software.xdev.bzst.dip.client.generated.client.ApiClient; +import software.xdev.bzst.dip.client.generated.client.ApiException; +import software.xdev.bzst.dip.client.generated.client.BaseApi; +import software.xdev.bzst.dip.client.generated.client.Configuration; +import software.xdev.bzst.dip.client.generated.client.Pair; + + +public class MdsProviderV21Api extends BaseApi +{ + + public MdsProviderV21Api() + { + super(Configuration.getDefaultApiClient()); + } + + public MdsProviderV21Api(final ApiClient apiClient) + { + super(apiClient); + } + + /** + * Abruf einer Liste aller Datentransfernummern, für die das Protokoll noch aussteht Abruf einer Liste aller + * Datentransfernummern, für die das Protokoll noch aussteht + * + * @return InputStream + * @throws ApiException if fails to make API call + */ + public InputStream alleOffenenDatentransfernummern() throws ApiException + { + return this.alleOffenenDatentransfernummern(Collections.emptyMap()); + } + + /** + * Abruf einer Liste aller Datentransfernummern, für die das Protokoll noch aussteht Abruf einer Liste aller + * Datentransfernummern, für die das Protokoll noch aussteht + * + * @param additionalHeaders additionalHeaders for this call + * @return InputStream + * @throws ApiException if fails to make API call + */ + public InputStream alleOffenenDatentransfernummern(final Map additionalHeaders) throws ApiException + { + final Object localVarPostBody = null; + + // create path and map variables + final String localVarPath = "/dip/md/v2_1/opennumbers"; + + final StringJoiner localVarQueryStringJoiner = new StringJoiner("&"); + String localVarQueryParameterBaseName; + final List localVarQueryParams = new ArrayList<>(); + final List localVarCollectionQueryParams = new ArrayList<>(); + final Map localVarHeaderParams = new HashMap<>(); + final Map localVarCookieParams = new HashMap<>(); + final Map localVarFormParams = new HashMap<>(); + + localVarHeaderParams.putAll(additionalHeaders); + + final String[] localVarAccepts = { + "application/octet-stream" + }; + final String localVarAccept = this.apiClient.selectHeaderAccept(localVarAccepts); + + final String[] localVarContentTypes = { + + }; + final String localVarContentType = this.apiClient.selectHeaderContentType(localVarContentTypes); + + final String[] localVarAuthNames = new String[]{"BearerAuth"}; + + final TypeReference localVarReturnType = new TypeReference<>() + { + }; + return this.apiClient.invokeAPI( + localVarPath, + "GET", + localVarQueryParams, + localVarCollectionQueryParams, + localVarQueryStringJoiner.toString(), + localVarPostBody, + localVarHeaderParams, + localVarCookieParams, + localVarFormParams, + localVarAccept, + localVarContentType, + localVarAuthNames, + localVarReturnType + ); + } + + /** + * Abruf einer Liste aller Datentransfernummern mit verfügbarem Protokoll Abruf einer Liste aller + * Datentransfernummern mit verfügbarem Protokoll + * + * @return InputStream + * @throws ApiException if fails to make API call + */ + public InputStream alleProtokollnummern() throws ApiException + { + return this.alleProtokollnummern(Collections.emptyMap()); + } + + /** + * Abruf einer Liste aller Datentransfernummern mit verfügbarem Protokoll Abruf einer Liste aller + * Datentransfernummern mit verfügbarem Protokoll + * + * @param additionalHeaders additionalHeaders for this call + * @return InputStream + * @throws ApiException if fails to make API call + */ + public InputStream alleProtokollnummern(final Map additionalHeaders) throws ApiException + { + final Object localVarPostBody = null; + + // create path and map variables + final String localVarPath = "/dip/md/v2_1/protocolnumbers"; + + final StringJoiner localVarQueryStringJoiner = new StringJoiner("&"); + String localVarQueryParameterBaseName; + final List localVarQueryParams = new ArrayList<>(); + final List localVarCollectionQueryParams = new ArrayList<>(); + final Map localVarHeaderParams = new HashMap<>(); + final Map localVarCookieParams = new HashMap<>(); + final Map localVarFormParams = new HashMap<>(); + + localVarHeaderParams.putAll(additionalHeaders); + + final String[] localVarAccepts = { + "application/octet-stream" + }; + final String localVarAccept = this.apiClient.selectHeaderAccept(localVarAccepts); + + final String[] localVarContentTypes = { + + }; + final String localVarContentType = this.apiClient.selectHeaderContentType(localVarContentTypes); + + final String[] localVarAuthNames = new String[]{"BearerAuth"}; + + final TypeReference localVarReturnType = new TypeReference<>() + { + }; + return this.apiClient.invokeAPI( + localVarPath, + "GET", + localVarQueryParams, + localVarCollectionQueryParams, + localVarQueryStringJoiner.toString(), + localVarPostBody, + localVarHeaderParams, + localVarCookieParams, + localVarFormParams, + localVarAccept, + localVarContentType, + localVarAuthNames, + localVarReturnType + ); + } + + /** + * Einreichung zusätzlicher Anhänge Einreichung zusätzlicher Anhänge unter Angabe einer Datentransfernummer + * + * @param datentransfernummer Die Datentransfernummer, die die Transaktion identifiziert (required) + * @param body Einreichung zusätzlicher Anhänge unter Angabe einer Datentransfernummer (optional) + * @throws ApiException if fails to make API call + */ + public void anhangEinreichen( + @jakarta.annotation.Nonnull final String datentransfernummer, + @jakarta.annotation.Nullable final InputStream body) throws ApiException + { + this.anhangEinreichen(datentransfernummer, body, Collections.emptyMap()); + } + + /** + * Einreichung zusätzlicher Anhänge Einreichung zusätzlicher Anhänge unter Angabe einer Datentransfernummer + * + * @param datentransfernummer Die Datentransfernummer, die die Transaktion identifiziert (required) + * @param body Einreichung zusätzlicher Anhänge unter Angabe einer Datentransfernummer (optional) + * @param additionalHeaders additionalHeaders for this call + * @throws ApiException if fails to make API call + */ + public void anhangEinreichen( + @jakarta.annotation.Nonnull final String datentransfernummer, + @jakarta.annotation.Nullable final InputStream body, + final Map additionalHeaders) throws ApiException + { + final Object localVarPostBody = body; + + // verify the required parameter 'datentransfernummer' is set + if(datentransfernummer == null) + { + throw new ApiException( + 400, + "Missing the required parameter 'datentransfernummer' when calling anhangEinreichen"); + } + + // create path and map variables + final String localVarPath = "/dip/md/v2_1/{datentransfernummer}/attachment" + .replaceAll( + "\\{" + "datentransfernummer" + "\\}", + this.apiClient.escapeString(this.apiClient.parameterToString(datentransfernummer))); + + final StringJoiner localVarQueryStringJoiner = new StringJoiner("&"); + String localVarQueryParameterBaseName; + final List localVarQueryParams = new ArrayList<>(); + final List localVarCollectionQueryParams = new ArrayList<>(); + final Map localVarHeaderParams = new HashMap<>(); + final Map localVarCookieParams = new HashMap<>(); + final Map localVarFormParams = new HashMap<>(); + + localVarHeaderParams.putAll(additionalHeaders); + + final String[] localVarAccepts = { + + }; + final String localVarAccept = this.apiClient.selectHeaderAccept(localVarAccepts); + + final String[] localVarContentTypes = { + "application/octet-stream" + }; + final String localVarContentType = this.apiClient.selectHeaderContentType(localVarContentTypes); + + final String[] localVarAuthNames = new String[]{"BearerAuth"}; + + this.apiClient.invokeAPI( + localVarPath, + "PUT", + localVarQueryParams, + localVarCollectionQueryParams, + localVarQueryStringJoiner.toString(), + localVarPostBody, + localVarHeaderParams, + localVarCookieParams, + localVarFormParams, + localVarAccept, + localVarContentType, + localVarAuthNames, + null + ); + } + + /** + * Abbruch der laufenden Übertragung und Verwerfen der bisher übertragenen Dateien Verkünden der Absicht, die + * laufende Massendatenlieferung abzubrechen und die übertragenen Dateien zu verwerfen + * + * @param datentransfernummer Die Datentransfernummer, die die Transaktion identifiziert (required) + * @throws ApiException if fails to make API call + */ + public void einreichungAbbrechen(@jakarta.annotation.Nonnull final String datentransfernummer) throws ApiException + { + this.einreichungAbbrechen(datentransfernummer, Collections.emptyMap()); + } + + /** + * Abbruch der laufenden Übertragung und Verwerfen der bisher übertragenen Dateien Verkünden der Absicht, die + * laufende Massendatenlieferung abzubrechen und die übertragenen Dateien zu verwerfen + * + * @param datentransfernummer Die Datentransfernummer, die die Transaktion identifiziert (required) + * @param additionalHeaders additionalHeaders for this call + * @throws ApiException if fails to make API call + */ + public void einreichungAbbrechen( + @jakarta.annotation.Nonnull final String datentransfernummer, + final Map additionalHeaders) throws ApiException + { + final Object localVarPostBody = null; + + // verify the required parameter 'datentransfernummer' is set + if(datentransfernummer == null) + { + throw new ApiException( + 400, + "Missing the required parameter 'datentransfernummer' when calling einreichungAbbrechen"); + } + + // create path and map variables + final String localVarPath = "/dip/md/v2_1/{datentransfernummer}/abort" + .replaceAll( + "\\{" + "datentransfernummer" + "\\}", + this.apiClient.escapeString(this.apiClient.parameterToString(datentransfernummer))); + + final StringJoiner localVarQueryStringJoiner = new StringJoiner("&"); + String localVarQueryParameterBaseName; + final List localVarQueryParams = new ArrayList<>(); + final List localVarCollectionQueryParams = new ArrayList<>(); + final Map localVarHeaderParams = new HashMap<>(); + final Map localVarCookieParams = new HashMap<>(); + final Map localVarFormParams = new HashMap<>(); + + localVarHeaderParams.putAll(additionalHeaders); + + final String[] localVarAccepts = { + + }; + final String localVarAccept = this.apiClient.selectHeaderAccept(localVarAccepts); + + final String[] localVarContentTypes = { + + }; + final String localVarContentType = this.apiClient.selectHeaderContentType(localVarContentTypes); + + final String[] localVarAuthNames = new String[]{"BearerAuth"}; + + this.apiClient.invokeAPI( + localVarPath, + "PATCH", + localVarQueryParams, + localVarCollectionQueryParams, + localVarQueryStringJoiner.toString(), + localVarPostBody, + localVarHeaderParams, + localVarCookieParams, + localVarFormParams, + localVarAccept, + localVarContentType, + localVarAuthNames, + null + ); + } + + /** + * Anfordern einer Datentransfernummer und Einleiten einer Massendatenlieferung Anfordern einer Datentransfernummer + * zur Identifikation der Lieferung und Einleiten einer Massendatenlieferung + * + * @param fachverfahren Das Ziel-Fachverfahren (required) + * @return String + * @throws ApiException if fails to make API call + */ + public String einreichungAnmelden(@jakarta.annotation.Nonnull final String fachverfahren) throws ApiException + { + return this.einreichungAnmelden(fachverfahren, Collections.emptyMap()); + } + + /** + * Anfordern einer Datentransfernummer und Einleiten einer Massendatenlieferung Anfordern einer Datentransfernummer + * zur Identifikation der Lieferung und Einleiten einer Massendatenlieferung + * + * @param fachverfahren Das Ziel-Fachverfahren (required) + * @param additionalHeaders additionalHeaders for this call + * @return String + * @throws ApiException if fails to make API call + */ + public String einreichungAnmelden( + @jakarta.annotation.Nonnull final String fachverfahren, + final Map additionalHeaders) throws ApiException + { + final Object localVarPostBody = null; + + // verify the required parameter 'fachverfahren' is set + if(fachverfahren == null) + { + throw new ApiException( + 400, + "Missing the required parameter 'fachverfahren' when calling einreichungAnmelden"); + } + + // create path and map variables + final String localVarPath = "/dip/md/v2_1/start/{fachverfahren}" + .replaceAll( + "\\{" + "fachverfahren" + "\\}", + this.apiClient.escapeString(this.apiClient.parameterToString(fachverfahren))); + + final StringJoiner localVarQueryStringJoiner = new StringJoiner("&"); + String localVarQueryParameterBaseName; + final List localVarQueryParams = new ArrayList<>(); + final List localVarCollectionQueryParams = new ArrayList<>(); + final Map localVarHeaderParams = new HashMap<>(); + final Map localVarCookieParams = new HashMap<>(); + final Map localVarFormParams = new HashMap<>(); + + localVarHeaderParams.putAll(additionalHeaders); + + final String[] localVarAccepts = { + "text/plain" + }; + final String localVarAccept = this.apiClient.selectHeaderAccept(localVarAccepts); + + final String[] localVarContentTypes = { + + }; + final String localVarContentType = this.apiClient.selectHeaderContentType(localVarContentTypes); + + final String[] localVarAuthNames = new String[]{"BearerAuth"}; + + final TypeReference localVarReturnType = new TypeReference<>() + { + }; + return this.apiClient.invokeAPI( + localVarPath, + "POST", + localVarQueryParams, + localVarCollectionQueryParams, + localVarQueryStringJoiner.toString(), + localVarPostBody, + localVarHeaderParams, + localVarCookieParams, + localVarFormParams, + localVarAccept, + localVarContentType, + localVarAuthNames, + localVarReturnType + ); + } + + /** + * Erklärung, dass die Massendatenlieferung abgeschlossen ist Erklärung der Fertigstellung der Massendatenlieferung + * + * @param datentransfernummer Die Datentransfernummer, die die Transaktion identifiziert (required) + * @throws ApiException if fails to make API call + */ + public void einreichungBeenden(@jakarta.annotation.Nonnull final String datentransfernummer) throws ApiException + { + this.einreichungBeenden(datentransfernummer, Collections.emptyMap()); + } + + /** + * Erklärung, dass die Massendatenlieferung abgeschlossen ist Erklärung der Fertigstellung der Massendatenlieferung + * + * @param datentransfernummer Die Datentransfernummer, die die Transaktion identifiziert (required) + * @param additionalHeaders additionalHeaders for this call + * @throws ApiException if fails to make API call + */ + public void einreichungBeenden( + @jakarta.annotation.Nonnull final String datentransfernummer, + final Map additionalHeaders) throws ApiException + { + final Object localVarPostBody = null; + + // verify the required parameter 'datentransfernummer' is set + if(datentransfernummer == null) + { + throw new ApiException( + 400, + "Missing the required parameter 'datentransfernummer' when calling einreichungBeenden"); + } + + // create path and map variables + final String localVarPath = "/dip/md/v2_1/{datentransfernummer}/finish" + .replaceAll( + "\\{" + "datentransfernummer" + "\\}", + this.apiClient.escapeString(this.apiClient.parameterToString(datentransfernummer))); + + final StringJoiner localVarQueryStringJoiner = new StringJoiner("&"); + String localVarQueryParameterBaseName; + final List localVarQueryParams = new ArrayList<>(); + final List localVarCollectionQueryParams = new ArrayList<>(); + final Map localVarHeaderParams = new HashMap<>(); + final Map localVarCookieParams = new HashMap<>(); + final Map localVarFormParams = new HashMap<>(); + + localVarHeaderParams.putAll(additionalHeaders); + + final String[] localVarAccepts = { + + }; + final String localVarAccept = this.apiClient.selectHeaderAccept(localVarAccepts); + + final String[] localVarContentTypes = { + + }; + final String localVarContentType = this.apiClient.selectHeaderContentType(localVarContentTypes); + + final String[] localVarAuthNames = new String[]{"BearerAuth"}; + + this.apiClient.invokeAPI( + localVarPath, + "PATCH", + localVarQueryParams, + localVarCollectionQueryParams, + localVarQueryStringJoiner.toString(), + localVarPostBody, + localVarHeaderParams, + localVarCookieParams, + localVarFormParams, + localVarAccept, + localVarContentType, + localVarAuthNames, + null + ); + } + + /** + * Einreichung des XML Einreichung der Daten-XML unter Angabe einer Datentransfernummer + * + * @param datentransfernummer Die Datentransfernummer, die die Transaktion identifiziert (required) + * @param body Einreichung der Daten-XML unter Angabe einer Datentransfernummer (optional) + * @throws ApiException if fails to make API call + */ + public void massendatenEinreichen( + @jakarta.annotation.Nonnull final String datentransfernummer, + @jakarta.annotation.Nullable final InputStream body) throws ApiException + { + this.massendatenEinreichen(datentransfernummer, body, Collections.emptyMap()); + } + + /** + * Einreichung des XML Einreichung der Daten-XML unter Angabe einer Datentransfernummer + * + * @param datentransfernummer Die Datentransfernummer, die die Transaktion identifiziert (required) + * @param body Einreichung der Daten-XML unter Angabe einer Datentransfernummer (optional) + * @param additionalHeaders additionalHeaders for this call + * @throws ApiException if fails to make API call + */ + public void massendatenEinreichen( + @jakarta.annotation.Nonnull final String datentransfernummer, + @jakarta.annotation.Nullable final InputStream body, + final Map additionalHeaders) throws ApiException + { + final Object localVarPostBody = body; + + // verify the required parameter 'datentransfernummer' is set + if(datentransfernummer == null) + { + throw new ApiException( + 400, + "Missing the required parameter 'datentransfernummer' when calling massendatenEinreichen"); + } + + // create path and map variables + final String localVarPath = "/dip/md/v2_1/{datentransfernummer}/xml" + .replaceAll( + "\\{" + "datentransfernummer" + "\\}", + this.apiClient.escapeString(this.apiClient.parameterToString(datentransfernummer))); + + final StringJoiner localVarQueryStringJoiner = new StringJoiner("&"); + String localVarQueryParameterBaseName; + final List localVarQueryParams = new ArrayList<>(); + final List localVarCollectionQueryParams = new ArrayList<>(); + final Map localVarHeaderParams = new HashMap<>(); + final Map localVarCookieParams = new HashMap<>(); + final Map localVarFormParams = new HashMap<>(); + + localVarHeaderParams.putAll(additionalHeaders); + + final String[] localVarAccepts = { + + }; + final String localVarAccept = this.apiClient.selectHeaderAccept(localVarAccepts); + + final String[] localVarContentTypes = { + "application/octet-stream" + }; + final String localVarContentType = this.apiClient.selectHeaderContentType(localVarContentTypes); + + final String[] localVarAuthNames = new String[]{"BearerAuth"}; + + this.apiClient.invokeAPI( + localVarPath, + "PUT", + localVarQueryParams, + localVarCollectionQueryParams, + localVarQueryStringJoiner.toString(), + localVarPostBody, + localVarHeaderParams, + localVarCookieParams, + localVarFormParams, + localVarAccept, + localVarContentType, + localVarAuthNames, + null + ); + } + + /** + * Abruf des Ergebnisprotokolls Abruf des Ergebnisprotokolls + * + * @param datentransfernummer Die Datentransfernummer, die die Transaktion identifiziert (required) + * @return InputStream + * @throws ApiException if fails to make API call + */ + public InputStream protokollAbrufen(@jakarta.annotation.Nonnull final String datentransfernummer) + throws ApiException + { + return this.protokollAbrufen(datentransfernummer, Collections.emptyMap()); + } + + /** + * Abruf des Ergebnisprotokolls Abruf des Ergebnisprotokolls + * + * @param datentransfernummer Die Datentransfernummer, die die Transaktion identifiziert (required) + * @param additionalHeaders additionalHeaders for this call + * @return InputStream + * @throws ApiException if fails to make API call + */ + public InputStream protokollAbrufen( + @jakarta.annotation.Nonnull final String datentransfernummer, + final Map additionalHeaders) throws ApiException + { + final Object localVarPostBody = null; + + // verify the required parameter 'datentransfernummer' is set + if(datentransfernummer == null) + { + throw new ApiException( + 400, + "Missing the required parameter 'datentransfernummer' when calling protokollAbrufen"); + } + + // create path and map variables + final String localVarPath = "/dip/md/v2_1/{datentransfernummer}/protocol" + .replaceAll( + "\\{" + "datentransfernummer" + "\\}", + this.apiClient.escapeString(this.apiClient.parameterToString(datentransfernummer))); + + final StringJoiner localVarQueryStringJoiner = new StringJoiner("&"); + String localVarQueryParameterBaseName; + final List localVarQueryParams = new ArrayList<>(); + final List localVarCollectionQueryParams = new ArrayList<>(); + final Map localVarHeaderParams = new HashMap<>(); + final Map localVarCookieParams = new HashMap<>(); + final Map localVarFormParams = new HashMap<>(); + + localVarHeaderParams.putAll(additionalHeaders); + + final String[] localVarAccepts = { + "application/octet-stream" + }; + final String localVarAccept = this.apiClient.selectHeaderAccept(localVarAccepts); + + final String[] localVarContentTypes = { + + }; + final String localVarContentType = this.apiClient.selectHeaderContentType(localVarContentTypes); + + final String[] localVarAuthNames = new String[]{"BearerAuth"}; + + final TypeReference localVarReturnType = new TypeReference<>() + { + }; + return this.apiClient.invokeAPI( + localVarPath, + "GET", + localVarQueryParams, + localVarCollectionQueryParams, + localVarQueryStringJoiner.toString(), + localVarPostBody, + localVarHeaderParams, + localVarCookieParams, + localVarFormParams, + localVarAccept, + localVarContentType, + localVarAuthNames, + localVarReturnType + ); + } + + /** + * Erhalt des Protokolls bestätigen Erhalt des Protokolls bestätigen + * + * @param datentransfernummer Die Datentransfernummer, die die Transaktion identifiziert (required) + * @throws ApiException if fails to make API call + */ + public void protokollErhalten(@jakarta.annotation.Nonnull final String datentransfernummer) throws ApiException + { + this.protokollErhalten(datentransfernummer, Collections.emptyMap()); + } + + /** + * Erhalt des Protokolls bestätigen Erhalt des Protokolls bestätigen + * + * @param datentransfernummer Die Datentransfernummer, die die Transaktion identifiziert (required) + * @param additionalHeaders additionalHeaders for this call + * @throws ApiException if fails to make API call + */ + public void protokollErhalten( + @jakarta.annotation.Nonnull final String datentransfernummer, + final Map additionalHeaders) throws ApiException + { + final Object localVarPostBody = null; + + // verify the required parameter 'datentransfernummer' is set + if(datentransfernummer == null) + { + throw new ApiException( + 400, + "Missing the required parameter 'datentransfernummer' when calling protokollErhalten"); + } + + // create path and map variables + final String localVarPath = "/dip/md/v2_1/{datentransfernummer}/protocol" + .replaceAll( + "\\{" + "datentransfernummer" + "\\}", + this.apiClient.escapeString(this.apiClient.parameterToString(datentransfernummer))); + + final StringJoiner localVarQueryStringJoiner = new StringJoiner("&"); + String localVarQueryParameterBaseName; + final List localVarQueryParams = new ArrayList<>(); + final List localVarCollectionQueryParams = new ArrayList<>(); + final Map localVarHeaderParams = new HashMap<>(); + final Map localVarCookieParams = new HashMap<>(); + final Map localVarFormParams = new HashMap<>(); + + localVarHeaderParams.putAll(additionalHeaders); + + final String[] localVarAccepts = { + + }; + final String localVarAccept = this.apiClient.selectHeaderAccept(localVarAccepts); + + final String[] localVarContentTypes = { + + }; + final String localVarContentType = this.apiClient.selectHeaderContentType(localVarContentTypes); + + final String[] localVarAuthNames = new String[]{"BearerAuth"}; + + this.apiClient.invokeAPI( + localVarPath, + "PATCH", + localVarQueryParams, + localVarCollectionQueryParams, + localVarQueryStringJoiner.toString(), + localVarPostBody, + localVarHeaderParams, + localVarCookieParams, + localVarFormParams, + localVarAccept, + localVarContentType, + localVarAuthNames, + null + ); + } + + @Override + public T invokeAPI( + final String url, + final String method, + final Object request, + final TypeReference returnType, + final Map additionalHeaders) throws ApiException + { + final String localVarPath = url.replace(this.apiClient.getBaseURL(), ""); + final StringJoiner localVarQueryStringJoiner = new StringJoiner("&"); + final List localVarQueryParams = new ArrayList<>(); + final List localVarCollectionQueryParams = new ArrayList<>(); + final Map localVarHeaderParams = new HashMap<>(); + final Map localVarCookieParams = new HashMap<>(); + final Map localVarFormParams = new HashMap<>(); + + localVarHeaderParams.putAll(additionalHeaders); + + final String[] localVarAccepts = { + + }; + final String localVarAccept = this.apiClient.selectHeaderAccept(localVarAccepts); + + final String[] localVarContentTypes = { + + }; + final String localVarContentType = this.apiClient.selectHeaderContentType(localVarContentTypes); + + final String[] localVarAuthNames = new String[]{"BearerAuth"}; + + return this.apiClient.invokeAPI( + localVarPath, + method, + localVarQueryParams, + localVarCollectionQueryParams, + localVarQueryStringJoiner.toString(), + request, + localVarHeaderParams, + localVarCookieParams, + localVarFormParams, + localVarAccept, + localVarContentType, + localVarAuthNames, + returnType + ); + } +} diff --git a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/ApiClient.java b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/ApiClient.java index 6955b631..0ac8398a 100644 --- a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/ApiClient.java +++ b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/ApiClient.java @@ -2,7 +2,7 @@ * dip-mds * DIP-Massendatenschnittstelle * - * The version of the OpenAPI document: DIP-MDS 1.3 + * The version of the OpenAPI document: DIP-MDS 2.1 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -56,6 +56,7 @@ import java.util.Date; import java.util.function.Supplier; import java.util.TimeZone; +import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -77,11 +78,12 @@ import java.text.DateFormat; import software.xdev.bzst.dip.client.generated.client.auth.Authentication; +import software.xdev.bzst.dip.client.generated.client.auth.HttpBearerAuth; public class ApiClient extends JavaTimeFormatter { - private Map defaultHeaderMap = new HashMap(); - private Map defaultCookieMap = new HashMap(); - private String basePath = "http://localhost"; + protected Map defaultHeaderMap = new HashMap(); + protected Map defaultCookieMap = new HashMap(); + protected String basePath = "http://localhost"; protected List servers = new ArrayList(Arrays.asList( new ServerConfiguration( "", @@ -91,22 +93,22 @@ public class ApiClient extends JavaTimeFormatter { )); protected Integer serverIndex = 0; protected Map serverVariables = null; - private boolean debugging = false; - private int connectionTimeout = 0; + protected boolean debugging = false; + protected int connectionTimeout = 0; - private CloseableHttpClient httpClient; - private ObjectMapper objectMapper; + protected CloseableHttpClient httpClient; + protected ObjectMapper objectMapper; protected String tempFolderPath = null; - private Map authentications; + protected Map authentications; - private int statusCode; - private Map> responseHeaders; + protected ThreadLocal lastStatusCode = new ThreadLocal<>(); + protected ThreadLocal>> lastResponseHeaders = new ThreadLocal<>(); - private DateFormat dateFormat; + protected DateFormat dateFormat; // Methods that can have a request body - private static List bodyMethods = Arrays.asList("POST", "PUT", "DELETE", "PATCH"); + protected static List bodyMethods = Arrays.asList("POST", "PUT", "DELETE", "PATCH"); public ApiClient(CloseableHttpClient httpClient) { objectMapper = new ObjectMapper(); @@ -118,15 +120,17 @@ public ApiClient(CloseableHttpClient httpClient) { objectMapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING); objectMapper.registerModule(new JavaTimeModule()); objectMapper.registerModule(new JsonNullableModule()); + objectMapper.registerModule(new RFC3339JavaTimeModule()); objectMapper.setDateFormat(ApiClient.buildDefaultDateFormat()); dateFormat = ApiClient.buildDefaultDateFormat(); // Set default User-Agent. - setUserAgent("OpenAPI-Generator/DIP-MDS 1.3/java"); + setUserAgent("OpenAPI-Generator/DIP-MDS 2.1/java"); // Setup authentications (key: authentication name, value: authentication). authentications = new HashMap(); + authentications.put("BearerAuth", new HttpBearerAuth("bearer")); // Prevent the authentications from being modified. authentications = Collections.unmodifiableMap(authentications); @@ -245,16 +249,18 @@ public ApiClient setServerVariables(Map serverVariables) { * * @return Status code */ + @Deprecated public int getStatusCode() { - return statusCode; + return lastStatusCode.get(); } /** * Gets the response headers of the previous request * @return Response headers */ + @Deprecated public Map> getResponseHeaders() { - return responseHeaders; + return lastResponseHeaders.get(); } /** @@ -286,6 +292,35 @@ public String getTempFolderPath() { return tempFolderPath; } + /** + * Helper method to set access token for the first Bearer authentication. + * @param bearerToken Bearer token + * @return API client + */ + public ApiClient setBearerToken(String bearerToken) { + for (Authentication auth : authentications.values()) { + if (auth instanceof HttpBearerAuth) { + ((HttpBearerAuth) auth).setBearerToken(bearerToken); + return this; + } + } + throw new RuntimeException("No Bearer authentication configured!"); + } + + /** + * Helper method to set the supplier of access tokens for Bearer authentication. + * + * @param tokenSupplier the token supplier function + */ + public void setBearerToken(Supplier tokenSupplier) { + for (Authentication auth : authentications.values()) { + if (auth instanceof HttpBearerAuth) { + ((HttpBearerAuth) auth).setBearerToken(tokenSupplier); + return; + } + } + throw new RuntimeException("No Bearer authentication configured!"); + } @@ -295,7 +330,7 @@ public String getTempFolderPath() { * @param userAgent User agent * @return API client */ - public ApiClient setUserAgent(String userAgent) { + public final ApiClient setUserAgent(String userAgent) { addDefaultHeader("User-Agent", userAgent); return this; } @@ -317,7 +352,7 @@ public ApiClient setTempFolderPath(String tempFolderPath) { * @param value The header's value * @return API client */ - public ApiClient addDefaultHeader(String key, String value) { + public final ApiClient addDefaultHeader(String key, String value) { defaultHeaderMap.put(key, value); return this; } @@ -473,7 +508,7 @@ public List parameterToPair(String name, Object value) { * @param value The value of the parameter. * @return A list of {@code Pair} objects. */ - public List parameterToPairs(String collectionFormat, String name, Collection value) { + public List parameterToPairs(String collectionFormat, String name, Collection value) { List params = new ArrayList(); // preconditions @@ -607,7 +642,7 @@ protected Map> transformResponseHeaders(Header[] headers) { /** * Parse content type object from header value */ - private ContentType getContentType(String headerValue) throws ApiException { + protected ContentType getContentType(String headerValue) throws ApiException { try { return ContentType.parse(headerValue); } catch (UnsupportedCharsetException e) { @@ -618,7 +653,7 @@ private ContentType getContentType(String headerValue) throws ApiException { /** * Get content type of a response or null if one was not provided */ - private String getResponseMimeType(HttpResponse response) throws ApiException { + protected String getResponseMimeType(HttpResponse response) throws ApiException { Header contentTypeHeader = response.getFirstHeader("Content-Type"); if (contentTypeHeader != null) { return getContentType(contentTypeHeader.getValue()).getMimeType(); @@ -713,10 +748,11 @@ public T deserialize(CloseableHttpResponse response, TypeReference valueT } return objectMapper.readValue(content, valueType); - } else if ("text/plain".equalsIgnoreCase(mimeType)) { + } else if (mimeType.toLowerCase().startsWith("text/")) { // convert input stream to string return (T) EntityUtils.toString(entity); } else { + Map> responseHeaders = transformResponseHeaders(response.getHeaders()); throw new ApiException( "Deserialization for content type '" + mimeType + "' not supported for type '" + valueType + "'", response.getCode(), @@ -726,7 +762,7 @@ public T deserialize(CloseableHttpResponse response, TypeReference valueT } } - private File downloadFileFromResponse(CloseableHttpResponse response) throws IOException { + protected File downloadFileFromResponse(CloseableHttpResponse response) throws IOException { Header contentDispositionHeader = response.getFirstHeader("Content-Disposition"); String contentDisposition = contentDispositionHeader == null ? null : contentDispositionHeader.getValue(); File file = prepareDownloadFile(contentDisposition); @@ -778,6 +814,7 @@ public String getBaseURL() { if (serverIndex != null) { if (serverIndex < 0 || serverIndex >= servers.size()) { throw new ArrayIndexOutOfBoundsException(String.format( + Locale.ROOT, "Invalid index %d when selecting the host settings. Must be less than %d", serverIndex, servers.size() )); } @@ -797,7 +834,7 @@ public String getBaseURL() { * @param urlQueryDeepObject URL query string of the deep object parameters * @return The full URL */ - private String buildUrl(String path, List queryParams, List collectionQueryParams, String urlQueryDeepObject) { + protected String buildUrl(String path, List queryParams, List collectionQueryParams, String urlQueryDeepObject) { String baseURL = getBaseURL(); final StringBuilder url = new StringBuilder(); @@ -862,12 +899,15 @@ protected Cookie buildCookie(String key, String value, URI uri) { } protected T processResponse(CloseableHttpResponse response, TypeReference returnType) throws ApiException, IOException, ParseException { - statusCode = response.getCode(); + int statusCode = response.getCode(); + lastStatusCode.set(statusCode); if (statusCode == HttpStatus.SC_NO_CONTENT) { return null; } - responseHeaders = transformResponseHeaders(response.getHeaders()); + Map> responseHeaders = transformResponseHeaders(response.getHeaders()); + lastResponseHeaders.set(responseHeaders); + if (isSuccessfulStatus(statusCode)) { return this.deserialize(response, returnType); } else { @@ -973,7 +1013,7 @@ public T invokeAPI( * @param headerParams Header parameters * @param cookieParams Cookie parameters */ - private void updateParamsForAuth(String[] authNames, List queryParams, Map headerParams, Map cookieParams) { + protected void updateParamsForAuth(String[] authNames, List queryParams, Map headerParams, Map cookieParams) { for (String authName : authNames) { Authentication auth = authentications.get(authName); if (auth == null) throw new RuntimeException("Authentication undefined: " + authName); diff --git a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/ApiException.java b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/ApiException.java index 5de05c34..1583a0ee 100644 --- a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/ApiException.java +++ b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/ApiException.java @@ -2,7 +2,7 @@ * dip-mds * DIP-Massendatenschnittstelle * - * The version of the OpenAPI document: DIP-MDS 1.3 + * The version of the OpenAPI document: DIP-MDS 2.1 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/BaseApi.java b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/BaseApi.java index efa7982d..b7f8a387 100644 --- a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/BaseApi.java +++ b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/BaseApi.java @@ -2,7 +2,7 @@ * dip-mds * DIP-Massendatenschnittstelle * - * The version of the OpenAPI document: DIP-MDS 1.3 + * The version of the OpenAPI document: DIP-MDS 2.1 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/Configuration.java b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/Configuration.java index 9a44b4ec..39d950af 100644 --- a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/Configuration.java +++ b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/Configuration.java @@ -2,7 +2,7 @@ * dip-mds * DIP-Massendatenschnittstelle * - * The version of the OpenAPI document: DIP-MDS 1.3 + * The version of the OpenAPI document: DIP-MDS 2.1 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -13,28 +13,50 @@ package software.xdev.bzst.dip.client.generated.client; +import java.util.Objects; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Supplier; + public class Configuration { - public static final String VERSION = "DIP-MDS 1.3"; - - private static ApiClient defaultApiClient = new ApiClient(); - - /** - * Get the default API client, which would be used when creating API - * instances without providing an API client. - * - * @return Default API client - */ - public static ApiClient getDefaultApiClient() { - return defaultApiClient; - } + public static final String VERSION = "DIP-MDS 2.1"; + + private static final AtomicReference defaultApiClient = new AtomicReference<>(); + private static volatile Supplier apiClientFactory = ApiClient::new; - /** - * Set the default API client, which would be used when creating API - * instances without providing an API client. - * - * @param apiClient API client - */ - public static void setDefaultApiClient(ApiClient apiClient) { - defaultApiClient = apiClient; + /** + * Get the default API client, which would be used when creating API instances without providing an API client. + * + * @return Default API client + */ + public static ApiClient getDefaultApiClient() { + ApiClient client = defaultApiClient.get(); + if (client == null) { + client = defaultApiClient.updateAndGet(val -> { + if (val != null) { // changed by another thread + return val; + } + return apiClientFactory.get(); + }); } -} + return client; + } + + /** + * Set the default API client, which would be used when creating API instances without providing an API client. + * + * @param apiClient API client + */ + public static void setDefaultApiClient(ApiClient apiClient) { + defaultApiClient.set(apiClient); + } + + /** + * set the callback used to create new ApiClient objects + */ + public static void setApiClientFactory(Supplier factory) { + apiClientFactory = Objects.requireNonNull(factory); + } + + private Configuration() { + } +} \ No newline at end of file diff --git a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/JavaTimeFormatter.java b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/JavaTimeFormatter.java index e9838d64..ce34efb1 100644 --- a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/JavaTimeFormatter.java +++ b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/JavaTimeFormatter.java @@ -2,7 +2,7 @@ * dip-mds * DIP-Massendatenschnittstelle * - * The version of the OpenAPI document: DIP-MDS 1.3 + * The version of the OpenAPI document: DIP-MDS 2.1 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -21,43 +21,47 @@ * It's generated for java clients when {@code AbstractJavaCodegen#dateLibrary} specified as {@code java8}. */ public class JavaTimeFormatter { + private DateTimeFormatter offsetDateTimeFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME; - private DateTimeFormatter offsetDateTimeFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME; + /** + * Get the date format used to parse/format {@code OffsetDateTime} parameters. + * + * @return DateTimeFormatter + */ + public DateTimeFormatter getOffsetDateTimeFormatter() { + return offsetDateTimeFormatter; + } - /** - * Get the date format used to parse/format {@code OffsetDateTime} parameters. - * @return DateTimeFormatter - */ - public DateTimeFormatter getOffsetDateTimeFormatter() { - return offsetDateTimeFormatter; - } + /** + * Set the date format used to parse/format {@code OffsetDateTime} parameters. + * + * @param offsetDateTimeFormatter {@code DateTimeFormatter} + */ + public void setOffsetDateTimeFormatter(DateTimeFormatter offsetDateTimeFormatter) { + this.offsetDateTimeFormatter = offsetDateTimeFormatter; + } - /** - * Set the date format used to parse/format {@code OffsetDateTime} parameters. - * @param offsetDateTimeFormatter {@code DateTimeFormatter} - */ - public void setOffsetDateTimeFormatter(DateTimeFormatter offsetDateTimeFormatter) { - this.offsetDateTimeFormatter = offsetDateTimeFormatter; + /** + * Parse the given string into {@code OffsetDateTime} object. + * + * @param str String + * @return {@code OffsetDateTime} + */ + public OffsetDateTime parseOffsetDateTime(String str) { + try { + return OffsetDateTime.parse(str, offsetDateTimeFormatter); + } catch (DateTimeParseException e) { + throw new RuntimeException(e); } + } - /** - * Parse the given string into {@code OffsetDateTime} object. - * @param str String - * @return {@code OffsetDateTime} - */ - public OffsetDateTime parseOffsetDateTime(String str) { - try { - return OffsetDateTime.parse(str, offsetDateTimeFormatter); - } catch (DateTimeParseException e) { - throw new RuntimeException(e); - } - } - /** - * Format the given {@code OffsetDateTime} object into string. - * @param offsetDateTime {@code OffsetDateTime} - * @return {@code OffsetDateTime} in string format - */ - public String formatOffsetDateTime(OffsetDateTime offsetDateTime) { - return offsetDateTimeFormatter.format(offsetDateTime); - } -} + /** + * Format the given {@code OffsetDateTime} object into string. + * + * @param offsetDateTime {@code OffsetDateTime} + * @return {@code OffsetDateTime} in string format + */ + public String formatOffsetDateTime(OffsetDateTime offsetDateTime) { + return offsetDateTimeFormatter.format(offsetDateTime); + } +} \ No newline at end of file diff --git a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/Pair.java b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/Pair.java index 7ca049eb..0772127f 100644 --- a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/Pair.java +++ b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/Pair.java @@ -2,7 +2,7 @@ * dip-mds * DIP-Massendatenschnittstelle * - * The version of the OpenAPI document: DIP-MDS 1.3 + * The version of the OpenAPI document: DIP-MDS 2.1 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -14,43 +14,23 @@ package software.xdev.bzst.dip.client.generated.client; public class Pair { - private String name = ""; - private String value = ""; + private final String name; + private final String value; - public Pair (String name, String value) { - setName(name); - setValue(value); - } + public Pair(String name, String value) { + this.name = isValidString(name) ? name : ""; + this.value = isValidString(value) ? value : ""; + } - private void setName(String name) { - if (!isValidString(name)) { - return; - } + public String getName() { + return this.name; + } - this.name = name; - } + public String getValue() { + return this.value; + } - private void setValue(String value) { - if (!isValidString(value)) { - return; - } - - this.value = value; - } - - public String getName() { - return this.name; - } - - public String getValue() { - return this.value; - } - - private boolean isValidString(String arg) { - if (arg == null) { - return false; - } - - return true; - } + private static boolean isValidString(String arg) { + return arg != null; + } } diff --git a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/RFC3339DateFormat.java b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/RFC3339DateFormat.java index af293037..bf42d07b 100644 --- a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/RFC3339DateFormat.java +++ b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/RFC3339DateFormat.java @@ -2,7 +2,7 @@ * dip-mds * DIP-Massendatenschnittstelle * - * The version of the OpenAPI document: DIP-MDS 1.3 + * The version of the OpenAPI document: DIP-MDS 2.1 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/RFC3339InstantDeserializer.java b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/RFC3339InstantDeserializer.java new file mode 100644 index 00000000..4ed3e5ca --- /dev/null +++ b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/RFC3339InstantDeserializer.java @@ -0,0 +1,98 @@ +/* + * dip-mds + * DIP-Massendatenschnittstelle + * + * The version of the OpenAPI document: DIP-MDS 2.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package software.xdev.bzst.dip.client.generated.client; + +import java.io.IOException; +import java.time.Instant; +import java.time.OffsetDateTime; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.time.temporal.Temporal; +import java.time.temporal.TemporalAccessor; +import java.util.function.BiFunction; +import java.util.function.Function; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeFeature; +import com.fasterxml.jackson.datatype.jsr310.deser.InstantDeserializer; + +public class RFC3339InstantDeserializer extends InstantDeserializer { + private final static boolean DEFAULT_NORMALIZE_ZONE_ID = JavaTimeFeature.NORMALIZE_DESERIALIZED_ZONE_ID.enabledByDefault(); + private final static boolean DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + = JavaTimeFeature.ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS.enabledByDefault(); + + public static final RFC3339InstantDeserializer INSTANT = new RFC3339InstantDeserializer<>( + Instant.class, DateTimeFormatter.ISO_INSTANT, + Instant::from, + a -> Instant.ofEpochMilli( a.value ), + a -> Instant.ofEpochSecond( a.integer, a.fraction ), + null, + true, // yes, replace zero offset with Z + DEFAULT_NORMALIZE_ZONE_ID, + DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + ); + + public static final RFC3339InstantDeserializer OFFSET_DATE_TIME = new RFC3339InstantDeserializer<>( + OffsetDateTime.class, DateTimeFormatter.ISO_OFFSET_DATE_TIME, + OffsetDateTime::from, + a -> OffsetDateTime.ofInstant( Instant.ofEpochMilli( a.value ), a.zoneId ), + a -> OffsetDateTime.ofInstant( Instant.ofEpochSecond( a.integer, a.fraction ), a.zoneId ), + (d, z) -> ( d.isEqual( OffsetDateTime.MIN ) || d.isEqual( OffsetDateTime.MAX ) ? + d : + d.withOffsetSameInstant( z.getRules().getOffset( d.toLocalDateTime() ) ) ), + true, // yes, replace zero offset with Z + DEFAULT_NORMALIZE_ZONE_ID, + DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + ); + + public static final RFC3339InstantDeserializer ZONED_DATE_TIME = new RFC3339InstantDeserializer<>( + ZonedDateTime.class, DateTimeFormatter.ISO_ZONED_DATE_TIME, + ZonedDateTime::from, + a -> ZonedDateTime.ofInstant( Instant.ofEpochMilli( a.value ), a.zoneId ), + a -> ZonedDateTime.ofInstant( Instant.ofEpochSecond( a.integer, a.fraction ), a.zoneId ), + ZonedDateTime::withZoneSameInstant, + false, // keep zero offset and Z separate since zones explicitly supported + DEFAULT_NORMALIZE_ZONE_ID, + DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + ); + + protected RFC3339InstantDeserializer( + Class supportedType, + DateTimeFormatter formatter, + Function parsedToValue, + Function fromMilliseconds, + Function fromNanoseconds, + BiFunction adjust, + boolean replaceZeroOffsetAsZ, + boolean normalizeZoneId, + boolean readNumericStringsAsTimestamp) { + super( + supportedType, + formatter, + parsedToValue, + fromMilliseconds, + fromNanoseconds, + adjust, + replaceZeroOffsetAsZ, + normalizeZoneId, + readNumericStringsAsTimestamp + ); + } + + @Override + protected T _fromString(JsonParser p, DeserializationContext ctxt, String string0) throws IOException { + return super._fromString(p, ctxt, string0.replace( ' ', 'T' )); + } +} \ No newline at end of file diff --git a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/RFC3339JavaTimeModule.java b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/RFC3339JavaTimeModule.java new file mode 100644 index 00000000..64ca674e --- /dev/null +++ b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/RFC3339JavaTimeModule.java @@ -0,0 +1,36 @@ +/* + * dip-mds + * DIP-Massendatenschnittstelle + * + * The version of the OpenAPI document: DIP-MDS 2.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package software.xdev.bzst.dip.client.generated.client; + +import java.time.Instant; +import java.time.OffsetDateTime; +import java.time.ZonedDateTime; + +import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.databind.Module.SetupContext; + +public class RFC3339JavaTimeModule extends SimpleModule { + public RFC3339JavaTimeModule() { + super("RFC3339JavaTimeModule"); + } + + @Override + public void setupModule(SetupContext context) { + super.setupModule(context); + + addDeserializer(Instant.class, RFC3339InstantDeserializer.INSTANT); + addDeserializer(OffsetDateTime.class, RFC3339InstantDeserializer.OFFSET_DATE_TIME); + addDeserializer(ZonedDateTime.class, RFC3339InstantDeserializer.ZONED_DATE_TIME); + } + +} diff --git a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/ServerConfiguration.java b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/ServerConfiguration.java index f0f728c3..52649210 100644 --- a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/ServerConfiguration.java +++ b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/ServerConfiguration.java @@ -1,3 +1,16 @@ +/* + * dip-mds + * DIP-Massendatenschnittstelle + * + * The version of the OpenAPI document: DIP-MDS 2.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + package software.xdev.bzst.dip.client.generated.client; import java.util.Map; diff --git a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/ServerVariable.java b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/ServerVariable.java index dcbef937..fd16ba0c 100644 --- a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/ServerVariable.java +++ b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/ServerVariable.java @@ -1,3 +1,16 @@ +/* + * dip-mds + * DIP-Massendatenschnittstelle + * + * The version of the OpenAPI document: DIP-MDS 2.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + package software.xdev.bzst.dip.client.generated.client; import java.util.HashSet; diff --git a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/StringUtil.java b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/StringUtil.java index fb7ec499..e04f6d02 100644 --- a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/StringUtil.java +++ b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/StringUtil.java @@ -2,7 +2,7 @@ * dip-mds * DIP-Massendatenschnittstelle * - * The version of the OpenAPI document: DIP-MDS 1.3 + * The version of the OpenAPI document: DIP-MDS 2.1 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/auth/ApiKeyAuth.java b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/auth/ApiKeyAuth.java index 06b9a5c7..4a17c202 100644 --- a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/auth/ApiKeyAuth.java +++ b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/auth/ApiKeyAuth.java @@ -2,7 +2,7 @@ * dip-mds * DIP-Massendatenschnittstelle * - * The version of the OpenAPI document: DIP-MDS 1.3 + * The version of the OpenAPI document: DIP-MDS 2.1 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/auth/Authentication.java b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/auth/Authentication.java index d0ac58e9..1ba7727a 100644 --- a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/auth/Authentication.java +++ b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/auth/Authentication.java @@ -2,7 +2,7 @@ * dip-mds * DIP-Massendatenschnittstelle * - * The version of the OpenAPI document: DIP-MDS 1.3 + * The version of the OpenAPI document: DIP-MDS 2.1 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,12 +19,12 @@ import java.util.List; public interface Authentication { - /** - * Apply authentication settings to header and query params. - * - * @param queryParams List of query parameters - * @param headerParams Map of header parameters - * @param cookieParams Map of cookie parameters - */ - void applyToParams(List queryParams, Map headerParams, Map cookieParams); + /** + * Apply authentication settings to header and query params. + * + * @param queryParams List of query parameters + * @param headerParams Map of header parameters + * @param cookieParams Map of cookie parameters + */ + void applyToParams(List queryParams, Map headerParams, Map cookieParams); } diff --git a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/auth/HttpBasicAuth.java b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/auth/HttpBasicAuth.java index f9009051..619b5159 100644 --- a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/auth/HttpBasicAuth.java +++ b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/auth/HttpBasicAuth.java @@ -2,7 +2,7 @@ * dip-mds * DIP-Massendatenschnittstelle * - * The version of the OpenAPI document: DIP-MDS 1.3 + * The version of the OpenAPI document: DIP-MDS 2.1 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/auth/HttpBearerAuth.java b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/auth/HttpBearerAuth.java index 540ab8f4..8a5b7807 100644 --- a/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/auth/HttpBearerAuth.java +++ b/bzst-dip-java-client/src/generated/java/software/xdev/bzst/dip/client/generated/client/auth/HttpBearerAuth.java @@ -2,7 +2,7 @@ * dip-mds * DIP-Massendatenschnittstelle * - * The version of the OpenAPI document: DIP-MDS 1.3 + * The version of the OpenAPI document: DIP-MDS 2.1 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -17,7 +17,6 @@ import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.function.Supplier; public class HttpBearerAuth implements Authentication { @@ -25,7 +24,7 @@ public class HttpBearerAuth implements Authentication { private Supplier tokenSupplier; public HttpBearerAuth(String scheme) { - this.scheme = scheme; + this.scheme = upperCaseBearer(scheme); } /** @@ -57,15 +56,14 @@ public void setBearerToken(Supplier tokenSupplier) { @Override public void applyToParams(List queryParams, Map headerParams, Map cookieParams) { - String bearerToken = Optional.ofNullable(tokenSupplier).map(Supplier::get).orElse(null); + String bearerToken = tokenSupplier != null ? tokenSupplier.get() : null; if (bearerToken == null) { return; } - - headerParams.put("Authorization", (scheme != null ? upperCaseBearer(scheme) + " " : "") + bearerToken); + headerParams.put("Authorization", (scheme != null ? scheme + " " : "") + bearerToken); } private static String upperCaseBearer(String scheme) { - return ("bearer".equalsIgnoreCase(scheme)) ? "Bearer" : scheme; + return "bearer".equalsIgnoreCase(scheme) ? "Bearer" : scheme; } } diff --git a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/BzstDipClient.java b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/BzstDipClient.java index 00c667ca..ed09da16 100644 --- a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/BzstDipClient.java +++ b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/BzstDipClient.java @@ -23,7 +23,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import software.xdev.bzst.dip.client.generated.api.MdEinreichenProviderApi; +import software.xdev.bzst.dip.client.generated.api.MdsProviderV21Api; import software.xdev.bzst.dip.client.generated.client.ApiClient; import software.xdev.bzst.dip.client.model.configuration.BzstDipConfiguration; import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopPaymentDataBody; @@ -64,9 +64,9 @@ public BzstDipClient(final BzstDipConfiguration configuration, final ApiClient a public BzstDipClient( final BzstDipConfiguration configuration, - final MdEinreichenProviderApi mdEinreichenProviderApi) + final MdsProviderV21Api mdsProviderV21Api) { - this(configuration, new WebClient(configuration, mdEinreichenProviderApi)); + this(configuration, new WebClient(configuration, mdsProviderV21Api)); } public BzstDipClient(final BzstDipConfiguration configuration, final WebClient webClient) diff --git a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/model/configuration/BzstDipConfiguration.java b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/model/configuration/BzstDipConfiguration.java index 6abcd3be..8fab9e74 100644 --- a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/model/configuration/BzstDipConfiguration.java +++ b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/model/configuration/BzstDipConfiguration.java @@ -147,8 +147,7 @@ public enum SupportedApplicationCode * the portal via Elster) or the BZST number and the associated type (ELSTER or BZSTCERT) are used. *

*

- * See Kommunikationshandbuch DIP-Standard 1.4 - Section 5.1.3: + * See Kommunikationshandbuch DIP-Standard 2.3 - Section 5.1.3: *

*/ private final String taxNumber; diff --git a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/webclient/BearerTokenRequester.java b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/webclient/BearerTokenRequester.java index b3181330..b88b183f 100644 --- a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/webclient/BearerTokenRequester.java +++ b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/webclient/BearerTokenRequester.java @@ -29,7 +29,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import io.jsonwebtoken.Jwts; -import software.xdev.bzst.dip.client.generated.api.MdEinreichenProviderApi; +import software.xdev.bzst.dip.client.generated.api.MdsProviderV21Api; import software.xdev.bzst.dip.client.model.configuration.BzstDipConfiguration; @@ -42,12 +42,12 @@ public class BearerTokenRequester private static final String BEARER_STRING = "Bearer "; public static final String MDS_POSTFIX = "/auth/realms/mds"; - private final MdEinreichenProviderApi client; + private final MdsProviderV21Api client; private final BzstDipConfiguration configuration; public BearerTokenRequester( final BzstDipConfiguration configuration, - final MdEinreichenProviderApi client + final MdsProviderV21Api client ) { this.configuration = configuration; diff --git a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/webclient/WebClient.java b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/webclient/WebClient.java index e79217ec..8a9ecee6 100644 --- a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/webclient/WebClient.java +++ b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/webclient/WebClient.java @@ -25,7 +25,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import software.xdev.bzst.dip.client.generated.api.MdEinreichenProviderApi; +import software.xdev.bzst.dip.client.generated.api.MdsProviderV21Api; import software.xdev.bzst.dip.client.generated.client.ApiClient; import software.xdev.bzst.dip.client.model.configuration.BzstDipConfiguration; import software.xdev.bzst.dip.client.model.message.dac7.BzstDipRequestStatusResult; @@ -41,26 +41,37 @@ public class WebClient private static final Logger LOGGER = LoggerFactory.getLogger(WebClient.class); public static final int OK_HTTP_STATUS_CODE = 200; - private final MdEinreichenProviderApi client; + private final BzstDipConfiguration configuration; + private final MdsProviderV21Api client; private final BearerTokenRequester bearerTokenRequester; public WebClient(final BzstDipConfiguration configuration) { - this(configuration, new MdEinreichenProviderApi()); - this.client.getApiClient().setBasePath(configuration.getRealmEnvironmentBaseUrl()); + this(configuration, new ApiClient()); } - public WebClient(final BzstDipConfiguration configuration, final ApiClient apiClient) + public WebClient( + final BzstDipConfiguration configuration, + final ApiClient apiClient) { - this(configuration, new MdEinreichenProviderApi(apiClient)); + this.configuration = configuration; + apiClient.setBasePath(configuration.getRealmEnvironmentBaseUrl()); + + this.client = new MdsProviderV21Api(apiClient); + + this.bearerTokenRequester = new BearerTokenRequester(configuration, new MdsProviderV21Api(apiClient)); + apiClient.setBearerToken(this.bearerTokenRequester::getAccessToken); } public WebClient( final BzstDipConfiguration configuration, - final MdEinreichenProviderApi mdEinreichenProviderApi) + final MdsProviderV21Api mdsProviderV21Api) { - this.client = mdEinreichenProviderApi; - this.bearerTokenRequester = new BearerTokenRequester(configuration, this.client); + this.configuration = configuration; + this.client = mdsProviderV21Api; + this.bearerTokenRequester = new BearerTokenRequester( + configuration, + new MdsProviderV21Api(mdsProviderV21Api.getApiClient())); } /** @@ -68,27 +79,21 @@ public WebClient( */ public String getDataTransferNumber() { - return this.getDataTransferNumber("DAC7"); + return this.getDataTransferNumber(this.configuration.getApplicationCode()); } public String getDataTransferNumber(final String fachverfahren) { LOGGER.debug("Getting data transfer number..."); - return this.client.einreichungAnmelden( - fachverfahren, - this.bearerTokenRequester.getAccessTokenWithBearerPrefix() - ); + return this.client.einreichungAnmelden(fachverfahren); } public void uploadMassData(final String dataTransferNumber, final String xmlString) { LOGGER.debug("Uploading the xml data..."); - this.client.massendatenEinreichen( - dataTransferNumber, - this.bearerTokenRequester.getAccessTokenWithBearerPrefix(), - new ByteArrayInputStream(xmlString.getBytes()) - ); + final InputStream inputStream = new ByteArrayInputStream(xmlString.getBytes(StandardCharsets.UTF_8)); + this.client.massendatenEinreichen(dataTransferNumber, inputStream); LOGGER.debug("Uploaded data successfully!"); } @@ -99,10 +104,7 @@ public void uploadMassData(final String dataTransferNumber, final String xmlStri public void closeSubmission(final String dataTransferNumber) { LOGGER.debug("Closing submission..."); - this.client.einreichungBeenden( - dataTransferNumber, - this.bearerTokenRequester.getAccessTokenWithBearerPrefix() - ); + this.client.einreichungBeenden(dataTransferNumber); LOGGER.debug("Closed submission successfully!"); } @@ -114,9 +116,7 @@ public void closeSubmission(final String dataTransferNumber) public List requestResultLogs() throws IOException { try( - final InputStream inputStream = this.client.alleProtokollnummern( - this.bearerTokenRequester.getAccessTokenWithBearerPrefix() - ) + final InputStream inputStream = this.client.alleProtokollnummern() ) { final String responseBody = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8); @@ -136,9 +136,7 @@ public BzstDipSingleTransferResult requestTransferResult(final String dataTransf { try( final InputStream inputStream = this.client.protokollAbrufen( - dataTransferNumber, - this.bearerTokenRequester.getAccessTokenWithBearerPrefix() - ) + dataTransferNumber) ) { // TODO: Check text @@ -153,20 +151,14 @@ public BzstDipSingleTransferResult requestTransferResult(final String dataTransf */ public BzstDipSingleTransferResult confirmTransfer(final String dataTransferNumber) { - this.client.protokollErhalten( - dataTransferNumber, - this.bearerTokenRequester.getAccessTokenWithBearerPrefix() - ); + this.client.protokollErhalten(dataTransferNumber); return new BzstDipSingleTransferResult(dataTransferNumber, OK_HTTP_STATUS_CODE); } public void abortSubmission(final String dataTransferNumber) { LOGGER.error("Aborting submission..."); - this.client.einreichungAbbrechen( - dataTransferNumber, - this.bearerTokenRequester.getAccessTokenWithBearerPrefix() - ); + this.client.einreichungAbbrechen(dataTransferNumber); LOGGER.debug("Aborted successfully."); } @@ -207,4 +199,11 @@ private BzstDipSingleTransferResult requestSingleTransferAndConfirm(final String } return singleTransferResult; } + + public void uploadAttachment(final String dataTransferNumber, final InputStream attachment) + { + LOGGER.debug("Uploading attachment..."); + this.client.anhangEinreichen(dataTransferNumber, attachment); + LOGGER.debug("Uploaded attachment successfully!"); + } } diff --git a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/ConsignmentType.java b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/ConsignmentType.java index 1b6cb21c..96a78c59 100644 --- a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/ConsignmentType.java +++ b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/ConsignmentType.java @@ -35,10 +35,10 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="customerIdentifier" type="{http://itzbund.de/ozg/bzst/post/dip/v1/}CustomerIdentifierType"/> + * <element name="customerIdentifier" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}CustomerIdentifierType"/> * <element name="creationTime" type="{http://www.w3.org/2001/XMLSchema}dateTime"/> - * <element name="transferticketId" type="{http://itzbund.de/ozg/bzst/post/dip/v1/}customTicketIdNumberType"/> - * <element name="referenceId" type="{http://itzbund.de/ozg/bzst/post/dip/v1/}customTicketIdNumberType" minOccurs="0"/> + * <element name="transferticketId" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}customTicketIdNumberType"/> + * <element name="referenceId" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}customTicketIdNumberType" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -46,7 +46,7 @@ * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ConsignmentType", namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/", propOrder = { +@XmlType(name = "ConsignmentType", namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/", propOrder = { "customerIdentifier", "creationTime", "transferticketId", @@ -55,14 +55,14 @@ public class ConsignmentType { - @XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/", required = true) + @XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/", required = true) protected CustomerIdentifierType customerIdentifier; - @XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/", required = true) + @XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/", required = true) @XmlSchemaType(name = "dateTime") protected XMLGregorianCalendar creationTime; - @XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/", required = true) + @XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/", required = true) protected String transferticketId; - @XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/") + @XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/") protected String referenceId; /** diff --git a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/CustomerIdentifierType.java b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/CustomerIdentifierType.java index 89fcc321..c80f5e7f 100644 --- a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/CustomerIdentifierType.java +++ b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/CustomerIdentifierType.java @@ -33,8 +33,8 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="identityProvider" type="{http://itzbund.de/ozg/bzst/post/dip/v1/}identityProviderType"/> - * <element name="identifier" type="{http://itzbund.de/ozg/bzst/post/dip/v1/}identifierType"/> + * <element name="identityProvider" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}identityProviderType"/> + * <element name="identifier" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}identifierType"/> * </sequence> * </restriction> * </complexContent> @@ -42,17 +42,17 @@ * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CustomerIdentifierType", namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/", propOrder = { +@XmlType(name = "CustomerIdentifierType", namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/", propOrder = { "identityProvider", "identifier" }) public class CustomerIdentifierType { - @XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/", required = true) + @XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/", required = true) @XmlSchemaType(name = "string") protected IdentityProviderType identityProvider; - @XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/", required = true) + @XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/", required = true) protected String identifier; /** diff --git a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/DipBodyType.java b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/DipBodyType.java index 7ddf6a02..f98a1629 100644 --- a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/DipBodyType.java +++ b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/DipBodyType.java @@ -35,7 +35,7 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="consignmentItem" type="{http://itzbund.de/ozg/bzst/post/dip/v1/}ConsignmentItemType" maxOccurs="unbounded"/> + * <element name="consignmentItem" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}ConsignmentItemType" maxOccurs="unbounded"/> * </sequence> * </restriction> * </complexContent> @@ -43,13 +43,13 @@ * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "DipBodyType", namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/", propOrder = { +@XmlType(name = "DipBodyType", namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/", propOrder = { "consignmentItem" }) public class DipBodyType { - @XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/", required = true) + @XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/", required = true) protected List consignmentItem; /** diff --git a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/DipHeaderType.java b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/DipHeaderType.java index cf5a45a0..718c58a9 100644 --- a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/DipHeaderType.java +++ b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/DipHeaderType.java @@ -33,26 +33,26 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="consignment" type="{http://itzbund.de/ozg/bzst/post/dip/v1/}ConsignmentType"/> - * <element name="application" type="{http://itzbund.de/ozg/bzst/post/dip/v1/}ApplicationType"/> + * <element name="consignment" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}ConsignmentType"/> + * <element name="application" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}ApplicationType"/> * </sequence> - * <attribute name="environment" use="required" type="{http://itzbund.de/ozg/bzst/post/dip/v1/}environmentType" /> + * <attribute name="environment" use="required" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}environmentType" /> * </restriction> * </complexContent> * </complexType> * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "DipHeaderType", namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/", propOrder = { +@XmlType(name = "DipHeaderType", namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/", propOrder = { "consignment", "application" }) public class DipHeaderType { - @XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/", required = true) + @XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/", required = true) protected ConsignmentType consignment; - @XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/", required = true) + @XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/", required = true) protected ApplicationType application; @XmlAttribute(name = "environment", required = true) protected EnvironmentType environment; diff --git a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/DipProtocolType.java b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/DipProtocolType.java new file mode 100644 index 00000000..4e669f07 --- /dev/null +++ b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/DipProtocolType.java @@ -0,0 +1,177 @@ +/* + * Copyright © 2024 XDEV Software (https://xdev.software) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + */ +// +// Diese Datei wurde mit der Eclipse Implementation of JAXB, v3.0.2 generiert +// Siehe https://eclipse-ee4j.github.io/jaxb-ri +// Änderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren. +// Generiert: 2025.10.29 um 12:56:51 PM CET +// + +package software.xdev.bzst.dip.client.xmldocument.model; + +import java.util.ArrayList; +import java.util.List; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; + + +/** + *

Java-Klasse für DipProtocolType complex type. + * + *

Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist. + * + * 

+ * <complexType name="DipProtocolType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="consignment" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}ConsignmentType" minOccurs="0"/>
+ *         <element name="processStatus" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}processStatusType"/>
+ *         <element name="dipResult" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}DipResultType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="payloadResult" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}PayloadResultType" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "DipProtocolType", propOrder = { + "consignment", + "processStatus", + "dipResult", + "payloadResult" +}) +public class DipProtocolType +{ + + protected ConsignmentType consignment; + @XmlElement(required = true) + @XmlSchemaType(name = "string") + protected ProcessStatusType processStatus; + protected List dipResult; + protected List payloadResult; + + /** + * Ruft den Wert der consignment-Eigenschaft ab. + * + * @return possible object is {@link ConsignmentType } + * + */ + public ConsignmentType getConsignment() + { + return this.consignment; + } + + /** + * Legt den Wert der consignment-Eigenschaft fest. + * + * @param value allowed object is {@link ConsignmentType } + * + */ + public void setConsignment(final ConsignmentType value) + { + this.consignment = value; + } + + /** + * Ruft den Wert der processStatus-Eigenschaft ab. + * + * @return possible object is {@link ProcessStatusType } + * + */ + public ProcessStatusType getProcessStatus() + { + return this.processStatus; + } + + /** + * Legt den Wert der processStatus-Eigenschaft fest. + * + * @param value allowed object is {@link ProcessStatusType } + * + */ + public void setProcessStatus(final ProcessStatusType value) + { + this.processStatus = value; + } + + /** + * Gets the value of the dipResult property. + * + *

+ * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you + * make to + * the returned list will be present inside the Jakarta XML Binding object. This is why there is not a + * set method for the dipResult property. + * + *

+ * For example, to add a new item, do as follows: + * 

+	 *    getDipResult().add(newItem);
+	 *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list {@link DipResultType } + * + * + */ + public List getDipResult() + { + if(this.dipResult == null) + { + this.dipResult = new ArrayList<>(); + } + return this.dipResult; + } + + /** + * Gets the value of the payloadResult property. + * + *

+ * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you + * make to + * the returned list will be present inside the Jakarta XML Binding object. This is why there is not a + * set method for the payloadResult property. + * + *

+ * For example, to add a new item, do as follows: + * 

+	 *    getPayloadResult().add(newItem);
+	 *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list {@link PayloadResultType } + * + * + */ + public List getPayloadResult() + { + if(this.payloadResult == null) + { + this.payloadResult = new ArrayList<>(); + } + return this.payloadResult; + } +} diff --git a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/DipResponseType.java b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/DipResponseType.java new file mode 100644 index 00000000..365ccc0a --- /dev/null +++ b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/DipResponseType.java @@ -0,0 +1,140 @@ +/* + * Copyright © 2024 XDEV Software (https://xdev.software) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + */ +// +// Diese Datei wurde mit der Eclipse Implementation of JAXB, v3.0.2 generiert +// Siehe https://eclipse-ee4j.github.io/jaxb-ri +// Änderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren. +// Generiert: 2025.10.29 um 12:56:51 PM CET +// + + +package software.xdev.bzst.dip.client.xmldocument.model; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; + + +/** + *

Java-Klasse für DipResponseType complex type. + * + *

Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist. + * + * 

+ * <complexType name="DipResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="responseTransferticketId" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}customTicketIdNumberType"/>
+ *         <element name="dipProtocol" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}DipProtocolType"/>
+ *       </sequence>
+ *       <attribute name="version" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "DipResponseType", propOrder = { + "responseTransferticketId", + "dipProtocol" +}) +public class DipResponseType { + + @XmlElement(required = true) + protected String responseTransferticketId; + @XmlElement(required = true) + protected DipProtocolType dipProtocol; + @XmlAttribute(name = "version", required = true) + protected String version; + + /** + * Ruft den Wert der responseTransferticketId-Eigenschaft ab. + * + * @return + * possible object is + * {@link String } + * + */ + public String getResponseTransferticketId() { + return this.responseTransferticketId; + } + + /** + * Legt den Wert der responseTransferticketId-Eigenschaft fest. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setResponseTransferticketId(final String value) { + this.responseTransferticketId = value; + } + + /** + * Ruft den Wert der dipProtocol-Eigenschaft ab. + * + * @return + * possible object is + * {@link DipProtocolType } + * + */ + public DipProtocolType getDipProtocol() { + return this.dipProtocol; + } + + /** + * Legt den Wert der dipProtocol-Eigenschaft fest. + * + * @param value + * allowed object is + * {@link DipProtocolType } + * + */ + public void setDipProtocol(final DipProtocolType value) { + this.dipProtocol = value; + } + + /** + * Ruft den Wert der version-Eigenschaft ab. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVersion() { + return this.version; + } + + /** + * Legt den Wert der version-Eigenschaft fest. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVersion(final String value) { + this.version = value; + } + +} diff --git a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/DipResultType.java b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/DipResultType.java new file mode 100644 index 00000000..a9770343 --- /dev/null +++ b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/DipResultType.java @@ -0,0 +1,142 @@ +/* + * Copyright © 2024 XDEV Software (https://xdev.software) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + */ +// +// Diese Datei wurde mit der Eclipse Implementation of JAXB, v3.0.2 generiert +// Siehe https://eclipse-ee4j.github.io/jaxb-ri +// Änderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren. +// Generiert: 2025.10.29 um 12:56:51 PM CET +// + + +package software.xdev.bzst.dip.client.xmldocument.model; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; + + +/** + * Enthält Fehler, die bei Validierungsfehlern in der POSt 2.0 Massendatenkomponente DIP aufgetreten sind. Vgl. auch Auflistung in + * Kapitel 7 Prüfungen und Rückmeldungen der DIP-Schnittstelle im Kommunikationshandbuch POSt 2.0 - DIP + * + * + *

Java-Klasse für DipResultType complex type. + * + *

Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist. + * + * 

+ * <complexType name="DipResultType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="code" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}dipCodeType"/>
+ *         <element name="message" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}dipMessageType" minOccurs="0"/>
+ *         <element name="cause" type="{http://www.w3.org/2001/XMLSchema}anyType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "DipResultType", propOrder = { + "code", + "message", + "cause" +}) +public class DipResultType { + + @XmlElement(required = true) + protected String code; + protected String message; + protected Object cause; + + /** + * Ruft den Wert der code-Eigenschaft ab. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCode() { + return this.code; + } + + /** + * Legt den Wert der code-Eigenschaft fest. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCode(final String value) { + this.code = value; + } + + /** + * Ruft den Wert der message-Eigenschaft ab. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return this.message; + } + + /** + * Legt den Wert der message-Eigenschaft fest. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(final String value) { + this.message = value; + } + + /** + * Ruft den Wert der cause-Eigenschaft ab. + * + * @return + * possible object is + * {@link Object } + * + */ + public Object getCause() { + return this.cause; + } + + /** + * Legt den Wert der cause-Eigenschaft fest. + * + * @param value + * allowed object is + * {@link Object } + * + */ + public void setCause(final Object value) { + this.cause = value; + } + +} diff --git a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/DipType.java b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/DipType.java index 7b61fed4..d2f03c97 100644 --- a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/DipType.java +++ b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/DipType.java @@ -34,8 +34,8 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="header" type="{http://itzbund.de/ozg/bzst/post/dip/v1/}DipHeaderType"/> - * <element name="body" type="{http://itzbund.de/ozg/bzst/post/dip/v1/}DipBodyType"/> + * <element name="header" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}DipHeaderType"/> + * <element name="body" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}DipBodyType"/> * </sequence> * <attribute name="version" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> * </restriction> @@ -52,9 +52,9 @@ public class DipType { - @XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/", required = true) + @XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/", required = true) protected DipHeaderType header; - @XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/", required = true) + @XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/", required = true) protected DipBodyType body; @XmlAttribute(name = "version", required = true) protected String version; diff --git a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/PayloadResultType.java b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/PayloadResultType.java new file mode 100644 index 00000000..92f0057a --- /dev/null +++ b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/PayloadResultType.java @@ -0,0 +1,167 @@ +/* + * Copyright © 2024 XDEV Software (https://xdev.software) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + */ +// +// Diese Datei wurde mit der Eclipse Implementation of JAXB, v3.0.2 generiert +// Siehe https://eclipse-ee4j.github.io/jaxb-ri +// Änderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren. +// Generiert: 2025.10.29 um 12:56:51 PM CET +// + +package software.xdev.bzst.dip.client.xmldocument.model; + +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.xml.namespace.QName; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyAttribute; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; + +import org.w3c.dom.Element; + + +/** + *

Java-Klasse für PayloadResultType complex type. + * + *

Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist. + * + * 

+ * <complexType name="PayloadResultType">
+ *   <complexContent>
+ *     <extension base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="consignmentItemPosition" use="required" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}consignmentItemPositionType" />
+ *       <attribute name="schemaVersion" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}schemaVersionType" />
+ *       <anyAttribute processContents='skip'/>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "PayloadResultType", propOrder = { + "any" +}) +public class PayloadResultType +{ + + @XmlAnyElement + protected List any; + @XmlAttribute(name = "consignmentItemPosition", required = true) + protected BigInteger consignmentItemPosition; + @XmlAttribute(name = "schemaVersion") + protected String schemaVersion; + @XmlAnyAttribute + private final Map otherAttributes = new HashMap<>(); + + /** + * Gets the value of the any property. + * + *

+ * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you + * make to + * the returned list will be present inside the Jakarta XML Binding object. This is why there is not a + * set method for the any property. + * + *

+ * For example, to add a new item, do as follows: + * 

+	 *    getAny().add(newItem);
+	 *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list {@link Element } + * + * + */ + public List getAny() + { + if(this.any == null) + { + this.any = new ArrayList<>(); + } + return this.any; + } + + /** + * Ruft den Wert der consignmentItemPosition-Eigenschaft ab. + * + * @return possible object is {@link BigInteger } + * + */ + public BigInteger getConsignmentItemPosition() + { + return this.consignmentItemPosition; + } + + /** + * Legt den Wert der consignmentItemPosition-Eigenschaft fest. + * + * @param value allowed object is {@link BigInteger } + * + */ + public void setConsignmentItemPosition(final BigInteger value) + { + this.consignmentItemPosition = value; + } + + /** + * Ruft den Wert der schemaVersion-Eigenschaft ab. + * + * @return possible object is {@link String } + * + */ + public String getSchemaVersion() + { + return this.schemaVersion; + } + + /** + * Legt den Wert der schemaVersion-Eigenschaft fest. + * + * @param value allowed object is {@link String } + * + */ + public void setSchemaVersion(final String value) + { + this.schemaVersion = value; + } + + /** + * Gets a map that contains attributes that aren't bound to any typed property on this class. + * + *

+ * the map is keyed by the name of the attribute and the value is the string value of the attribute. + *

+ * the map returned by this method is live, and you can add new attribute by updating the map directly. Because of + * this design, there's no setter. + * + * @return always non-null + */ + public Map getOtherAttributes() + { + return this.otherAttributes; + } +} diff --git a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/ProcessStatusType.java b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/ProcessStatusType.java index 9fed49d0..a4825e9c 100644 --- a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/ProcessStatusType.java +++ b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/ProcessStatusType.java @@ -34,7 +34,7 @@ * </simpleType> * */ -@XmlType(name = "processStatusType", namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/") +@XmlType(name = "processStatusType", namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/") @XmlEnum public enum ProcessStatusType { diff --git a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/package-info.java b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/package-info.java index ae02affb..3c2531e4 100644 --- a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/package-info.java +++ b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/package-info.java @@ -14,14 +14,14 @@ * limitations under the License. */ // Prefixes -@XmlSchema(location = "http://itzbund.de/ozg/bzst/post/dip/v1/dip.xsd", namespace = "http://itzbund" - + ".de/ozg/bzst/post/dip/v1/", +@XmlSchema(location = "http://itzbund.de/ozg/bzst/post/dip/v2/dip.xsd", namespace = "http://itzbund" + + ".de/ozg/bzst/post/dip/v2/", xmlns = { - @XmlNs(namespaceURI = "http://itzbund.de/ozg/bzst/post/dip/v1/", prefix = "dip"), - @XmlNs(namespaceURI = "urn:oecd:ties:dpi:v1", prefix = "dpi"), - @XmlNs(namespaceURI = "urn:oecd:ties:isodpitypes:v1", prefix = "iso"), - @XmlNs(namespaceURI = "urn:oecd:ties:dpistf:v1", prefix = "stf"), + @XmlNs(namespaceURI = "http://itzbund.de/ozg/bzst/post/dip/v2/", prefix = "dip"), + @XmlNs(namespaceURI = "urn:oecd:ties:dpi:v2", prefix = "dpi"), + @XmlNs(namespaceURI = "urn:oecd:ties:isodpitypes:v2", prefix = "iso"), + @XmlNs(namespaceURI = "urn:oecd:ties:dpistf:v2", prefix = "stf"), @XmlNs(namespaceURI = "http://www.w3.org/2001/XMLSchema-instance", prefix = "xsi"), }, elementFormDefault = XmlNsForm.QUALIFIED) diff --git a/bzst-dip-java-client/src/main/resources/xsd/dip-types.xsd b/bzst-dip-java-client/src/main/resources/xsd/dip-types.xsd index 920d452e..ddb00c4b 100644 --- a/bzst-dip-java-client/src/main/resources/xsd/dip-types.xsd +++ b/bzst-dip-java-client/src/main/resources/xsd/dip-types.xsd @@ -1,10 +1,13 @@ - + - Identifikationskennung des Datenübermittlers, anhand dieser eineindeutig verifiziert werden kann. I.d.R. ein dem Fachverfahren/Fachbereich bekannte Kennung z.B. ELSTER-Konto-ID oder BZST-Zertifikats-Nummer + Identifikationskennung des Datenübermittlers, anhand dieser eineindeutig verifiziert werden kann. I.d.R. ein dem + Fachverfahren/Fachbereich bekannte Kennung z.B. ELSTER-Konto-ID oder BZST-Zertifikats-Nummer + @@ -19,35 +22,54 @@ - Identifikationsnummer einer Bezugs-Lieferung als Referenz auf die transferticketId einer vorhergehende Lieferung + Identifikationsnummer einer Bezugs-Lieferung als Referenz auf die transferticketId einer vorhergehende Lieferung + - + - Benutzerkennung des Antragstellers im POSt2.0 (BOPNeu) für Zustellung eines Verwaltungsaktes im Portal. + + Benutzerkennung des Antragstellers im POSt2.0 + (BOPNeu) für Zustellung eines Verwaltungsaktes + im Portal. + - Beinhaltet die Nutzdaten im Format des Fachverfahren-XMLs + + Beinhaltet die Nutzdaten im Format des + Fachverfahren-XMLs + + + + + Position, die auch bei der Rückgabe des Protokolls in PayloadResultType verwendet wird. + Korrelation zwischen Lieferung und Rückgabe für ein ConsignmentItem + + + - Festlegung, welchem Provider die Identifier-Kennung zuzuordnen ist: BZST-CERT einem BZSt-Zertifikat, ELSTER einem ELSTER-Konto + Festlegung, welchem Provider der Identifier zuzuordnen ist: BZST-CERT bei einem BZSt-Konto, ELSTER bei einem + ELSTER-Konto + - Identifier-Kennung + BZSt-Nummer oder Steuernummer entsprechend dem Provider @@ -99,7 +121,8 @@ - Festlegung, welchem Provider die Identifier-Kennung zuzuordnen ist: BZST-CERT einem BZSt-Zertifikat, ELSTER einem ELSTER-Konto + Festlegung, welchem Provider die Identifier-Kennung zuzuordnen ist: BZST-CERT einem BZSt-Zertifikat, ELSTER einem ELSTER-Konto + @@ -111,8 +134,8 @@ XML-Schemaversion des Fachverfahrens-XSD, welches innerhalb body/consignmentItem/data zum Einsatz kommt. - - + + diff --git a/bzst-dip-java-client/src/main/resources/xsd/dip.xsd b/bzst-dip-java-client/src/main/resources/xsd/dip.xsd index 376966b0..23925add 100644 --- a/bzst-dip-java-client/src/main/resources/xsd/dip.xsd +++ b/bzst-dip-java-client/src/main/resources/xsd/dip.xsd @@ -1,15 +1,14 @@ - + - + - + @@ -31,126 +30,4 @@ - - - - - Identifikationskennung des Datenübermittlers, anhand dieser eineindeutig verifiziert werden kann. I.d.R. ein dem Fachverfahren/Fachbereich bekannte Kennung z.B. ELSTER-Konto-ID oder BZST-Zertifikats-Nummer - - - - - Erzeugungszeitpunkt der Lieferung als Zeitstempel - - - - - Identifikationsnummer der Lieferung, eine eineindeutige Kennung dieser Lieferung - - - - - Identifikationsnummer einer Bezugs-Lieferung als Referenz auf die transferticketId einer vorhergehende Lieferung - - - - - - - - - Benutzerkennung des Antragstellers im POSt2.0 (BOPNeu) für Zustellung eines Verwaltungsaktes im Portal. - - - - - Beinhaltet die Nutzdaten im Format des Fachverfahren-XMLs - - - - - - - - - Festlegung, welchem Provider die Identifier-Kennung zuzuordnen ist: BZST-CERT einem BZSt-Zertifikat, ELSTER einem ELSTER-Konto - - - - - Identifier-Kennung - - - - - - - - - - - - - Benennung des Ziel-Fachverfahrens, z.B. DAC7, CESOP, CRS. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Festlegung, welchem Provider die Identifier-Kennung zuzuordnen ist: BZST-CERT einem BZSt-Zertifikat, ELSTER einem ELSTER-Konto - - - - - - - - - XML-Schemaversion des Fachverfahrens-XSD, welches innerhalb body/consignmentItem/data zum Einsatz kommt. - - - - - - - - - - Benennung des Ziel-Fachverfahrens, z.B. DAC7, CESOP, CRS - - - - + \ No newline at end of file diff --git a/bzst-dip-java-client/src/main/resources/xsd/dipResponse.xsd b/bzst-dip-java-client/src/main/resources/xsd/dipResponse.xsd new file mode 100644 index 00000000..78398640 --- /dev/null +++ b/bzst-dip-java-client/src/main/resources/xsd/dipResponse.xsd @@ -0,0 +1,74 @@ + + + + + + + + + TransferticketId der Antwort + + + + + + + + + + + Angabe des Elements consignment der zugehörigen Lieferung für Referenzzwecke im Kundensystem. Kann entfallen, falls + Vorabprüfungen (z.B. Virus gefunden) das Einlesen des Dip-Headers verhindert haben. + + + + + + Gesamtergebnis der Lieferung: OK für erfolgreiche Annahme der gesamten Lieferung ohne Validierungsfehler. + PARTIALLY_REJECTED, die Lieferung wurde angenommen, es sind allerdings Fehler/Hinweise im Element payloadResult enthalten. ERROR, die + Lieferung wurde als ganzes abgelehnt; Fehler sind entweder im Element dipResult oder payloadResult aufgelistet. + + + + + + + + + + Enthält Fehler, die bei Validierungsfehlern in der POSt 2.0 Massendatenkomponente DIP aufgetreten sind. Vgl. auch Auflistung in + Kapitel 7 Prüfungen und Rückmeldungen der DIP-Schnittstelle im Kommunikationshandbuch POSt 2.0 - DIP + + + + + + + + Enthält ggf. Grund für den Fehler. + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/openapi/INFO.md b/openapi/INFO.md index 33a3e696..7480152c 100644 --- a/openapi/INFO.md +++ b/openapi/INFO.md @@ -1,4 +1,6 @@ -This ``openapi.yml`` is based on the [official available one](https://www.bzst.de/SharedDocs/Downloads/DE/EOP_BOP/dip_open_api.yaml) with minor modifications. +This ``openapi.yml`` is based on +the [official available one](https://www.bzst.de/SharedDocs/Downloads/EN/EOP_BOP/dip_open_api_zip_version_2_1.7z?__blob=publicationFile&v=3) +with minor modifications. The Java API Client can be generated using ``mvn clean compile -P openapi-generator`` inside [``bzst-dip-java-client``](../bzst-dip-java-client/). diff --git a/openapi/openapi.yml b/openapi/openapi.yml index 8f30794a..4bfdf15f 100644 --- a/openapi/openapi.yml +++ b/openapi/openapi.yml @@ -1,16 +1,25 @@ -openapi: 3.0.1 +openapi: 3.0.3 info: title: dip-mds description: DIP-Massendatenschnittstelle - version: DIP-MDS 1.3 + version: DIP-MDS 2.1 tags: - - name: MdEinreichenProvider + - name: MDSProviderV2_1 description: Einreichen von Massendatenlieferungen +components: + securitySchemes: + BearerAuth: + type: http + scheme: bearer + bearerFormat: JWT + description: "Authorization token (Bearer )" +security: + - BearerAuth: [ ] paths: - /dip/start/{fachverfahren}: + /dip/md/v2_1/start/{fachverfahren}: post: tags: - - MdEinreichenProvider + - MDSProviderV2_1 summary: Anfordern einer Datentransfernummer und Einleiten einer Massendatenlieferung description: >- Anfordern einer Datentransfernummer zur Identifikation der Lieferung und Einleiten einer Massendatenlieferung @@ -22,10 +31,6 @@ paths: required: true schema: type: string - - name: Authorization - schema: - type: string - in: header responses: '201': description: Datentransfer erfolgreich initiiert @@ -41,10 +46,10 @@ paths: description: Der Client hat zu viele Anfragen in einem bestimmten Zeitraum gesendet '500': description: Interner Fehler - /dip/md/{datentransfernummer}/xml: + /dip/md/v2_1/{datentransfernummer}/xml: put: tags: - - MdEinreichenProvider + - MDSProviderV2_1 summary: Einreichung des XML description: >- Einreichung der Daten-XML unter Angabe einer Datentransfernummer @@ -56,10 +61,6 @@ paths: required: true schema: type: string - - name: Authorization - schema: - type: string - in: header requestBody: description: >- Einreichung der Daten-XML unter Angabe einer Datentransfernummer @@ -74,16 +75,18 @@ paths: description: Ungültige Datentransfernummer '401': description: Ungültiger Authorization Header + '409': + description: Ungültige Schnittstellen Version '410': description: Datentransfer wurde bereits beendet '424': description: Der Datenübermittler ist dem Vorgang nicht zugeordnet '500': description: Interner Fehler - /dip/md/{datentransfernummer}/attachment: + /dip/md/v2_1/{datentransfernummer}/attachment: put: tags: - - MdEinreichenProvider + - MDSProviderV2_1 summary: Einreichung zusätzlicher Anhänge description: >- Einreichung zusätzlicher Anhänge unter Angabe einer Datentransfernummer @@ -95,10 +98,6 @@ paths: required: true schema: type: string - - name: Authorization - schema: - type: string - in: header requestBody: description: >- Einreichung zusätzlicher Anhänge unter Angabe einer Datentransfernummer @@ -113,14 +112,16 @@ paths: description: Ungültige Datentransfernummer '401': description: Ungültiger Authorization Header + '409': + description: Ungültige Schnittstellen Version '424': description: Der Datenübermittler ist dem Vorgang nicht zugeordnet '500': description: Interner Fehler - /dip/md/{datentransfernummer}/finish: + /dip/md/v2_1/{datentransfernummer}/finish: patch: tags: - - MdEinreichenProvider + - MDSProviderV2_1 summary: Erklärung, dass die Massendatenlieferung abgeschlossen ist description: >- Erklärung der Fertigstellung der Massendatenlieferung @@ -132,10 +133,6 @@ paths: required: true schema: type: string - - name: Authorization - schema: - type: string - in: header responses: '200': description: Anfrage erfolgreich @@ -143,16 +140,18 @@ paths: description: Ungültige Datentransfernummer '401': description: Ungültiger Authorization Header + '409': + description: Ungültige Schnittstellen Version '410': description: Datentransfer wurde bereits beendet '424': description: Der Datenübermittler ist dem Vorgang nicht zugeordnet '500': description: Interner Fehler - /dip/md/{datentransfernummer}/abort: + /dip/md/v2_1/{datentransfernummer}/abort: patch: tags: - - MdEinreichenProvider + - MDSProviderV2_1 summary: Abbruch der laufenden Übertragung und Verwerfen der bisher übertragenen Dateien description: >- Verkünden der Absicht, die laufende Massendatenlieferung abzubrechen und die übertragenen Dateien zu verwerfen @@ -164,10 +163,6 @@ paths: required: true schema: type: string - - name: Authorization - schema: - type: string - in: header responses: '200': description: Anfrage erfolgreich @@ -175,16 +170,18 @@ paths: description: Ungültige Datentransfernummer '401': description: Ungültiger Authorization Header + '409': + description: Ungültige Schnittstellen Version '410': description: Datentransfer wurde bereits beendet '424': description: Der Datenübermittler ist dem Vorgang nicht zugeordnet '500': description: Interner Fehler - /dip/md/{datentransfernummer}/protocol: + /dip/md/v2_1/{datentransfernummer}/protocol: get: tags: - - MdEinreichenProvider + - MDSProviderV2_1 summary: Abruf des Ergebnisprotokolls description: Abruf des Ergebnisprotokolls operationId: protokollAbrufen @@ -195,10 +192,6 @@ paths: required: true schema: type: string - - name: Authorization - schema: - type: string - in: header responses: '200': description: Anfrage erfolgreich @@ -210,6 +203,8 @@ paths: description: Ungültige Datentransfernummer '401': description: Ungültiger Authorization Header + '409': + description: Ungültige Schnittstellen Version '404': description: Protokoll liegt nicht vor '424': @@ -218,7 +213,7 @@ paths: description: Interner Fehler patch: tags: - - MdEinreichenProvider + - MDSProviderV2_1 summary: Erhalt des Protokolls bestätigen description: Erhalt des Protokolls bestätigen operationId: protokollErhalten @@ -229,10 +224,6 @@ paths: required: true schema: type: string - - name: Authorization - schema: - type: string - in: header responses: '200': description: Anfrage erfolgreich @@ -246,18 +237,13 @@ paths: description: Der Datenübermittler ist dem Vorgang nicht zugeordnet '500': description: Interner Fehler - /dip/md/protocolnumbers: + /dip/md/v2_1/protocolnumbers: get: tags: - - MdEinreichenProvider + - MDSProviderV2_1 summary: Abruf einer Liste aller Datentransfernummern mit verfügbarem Protokoll description: Abruf einer Liste aller Datentransfernummern mit verfügbarem Protokoll operationId: alleProtokollnummern - parameters: - - name: Authorization - schema: - type: string - in: header responses: '200': description: Anfrage erfolgreich @@ -269,3 +255,21 @@ paths: description: Ungültiger Authorization Header '500': description: Interner Fehler + /dip/md/v2_1/opennumbers: + get: + tags: + - MDSProviderV2_1 + summary: Abruf einer Liste aller Datentransfernummern, für die das Protokoll noch aussteht + description: Abruf einer Liste aller Datentransfernummern, für die das Protokoll noch aussteht + operationId: alleOffenenDatentransfernummern + responses: + '200': + description: Anfrage erfolgreich + content: + application/octet-stream: + schema: + type: InputStream + '401': + description: Ungültiger Authorization Header + '500': + description: Interner Fehler \ No newline at end of file