From 2c3c1d6bb748a0655a83fdf4cd26135042d898b9 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Fri, 19 Jul 2019 10:35:29 +0200 Subject: USP client integration switch to v2.0.7 --- .../xsd/mis/usp_v2/eai/syncmsgs/FilterType.java | 30 +------ .../usp_v2/eai/syncmsgs/ListMandatesRequest.java | 6 +- .../eai/syncmsgs/ListMandatesResponseType.java | 4 +- .../MandateAttributesSearchFilterType.java | 51 +++++++----- .../eai/syncmsgs/MandateIDSearchFilterType.java | 31 ++++++- .../xsd/mis/usp_v2/eai/syncmsgs/ObjectFactory.java | 90 ++++++++++++++++++++ .../mis/usp_v2/eai/syncmsgs/PaginationFilter.java | 31 ++++++- .../mis/usp_v2/eai/syncmsgs/PaginationType.java | 43 ++++++++++ .../eai/syncmsgs/SearchCriteriaTestType.java | 62 ++++++++++++++ .../usp_v2/eai/syncmsgs/SearchCriteriaType.java | 97 ++++++++++++++++++++++ .../xsd/mis/usp_v2/mandates/PropertiesType.java | 2 +- .../usp_v2/mandates/SimpleMandateContentType.java | 12 +-- .../persondata/CompactCorporateBodyType.java | 2 +- .../usp_v2/persondata/CompactPersonDataType.java | 18 ++-- .../persondata/CompactPhysicalPersonType.java | 2 +- .../mis/usp_v2/persondata/CorporateBodyType.java | 2 +- .../mis/usp_v2/persondata/IdentificationType.java | 2 +- .../mis/usp_v2/persondata/InternetAddressType.java | 2 +- .../xsd/mis/usp_v2/persondata/NationalityType.java | 12 +-- .../xsd/mis/usp_v2/persondata/PersonDataType.java | 18 ++-- .../mis/usp_v2/persondata/PhysicalPersonType.java | 2 +- .../usp_v2/persondata/TelephoneAddressType.java | 2 +- .../usp_v2/persondata/TypedPostalAddressType.java | 2 +- .../xsd/mis/usp_v2/xmldsig/DigestMethodType.java | 2 +- .../util/xsd/mis/usp_v2/xmldsig/KeyInfoType.java | 20 ++--- .../util/xsd/mis/usp_v2/xmldsig/KeyValueType.java | 10 +-- .../gv/util/xsd/mis/usp_v2/xmldsig/ObjectType.java | 2 +- .../util/xsd/mis/usp_v2/xmldsig/PGPDataType.java | 4 +- .../util/xsd/mis/usp_v2/xmldsig/SPKIDataType.java | 2 +- .../mis/usp_v2/xmldsig/SignatureMethodType.java | 2 +- .../mis/usp_v2/xmldsig/SignaturePropertyType.java | 2 +- .../util/xsd/mis/usp_v2/xmldsig/TransformType.java | 4 +- .../util/xsd/mis/usp_v2/xmldsig/X509DataType.java | 10 +-- 33 files changed, 459 insertions(+), 122 deletions(-) create mode 100644 src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/PaginationType.java create mode 100644 src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/SearchCriteriaTestType.java create mode 100644 src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/SearchCriteriaType.java (limited to 'src/main/java/at/gv/util/xsd/mis') diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/FilterType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/FilterType.java index 97c6fce..3e045a5 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/FilterType.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/FilterType.java @@ -3,7 +3,9 @@ package at.gv.util.xsd.mis.usp_v2.eai.syncmsgs; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAnyElement; import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlMixed; import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; @@ -28,9 +30,6 @@ import javax.xml.bind.annotation.XmlType; * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "FilterType", propOrder = { - "filter" -}) @XmlSeeAlso({ MandateAttributesSearchFilterType.class, MandateIDSearchFilterType.class, @@ -39,31 +38,8 @@ import javax.xml.bind.annotation.XmlType; }) public class FilterType { - @XmlElement(name = "Filter", required = true) - protected Object filter; - /** - * Ruft den Wert der filter-Eigenschaft ab. - * - * @return - * possible object is - * {@link Object } - * - */ - public Object getFilter() { - return filter; - } - /** - * Legt den Wert der filter-Eigenschaft fest. - * - * @param value - * allowed object is - * {@link Object } - * - */ - public void setFilter(Object value) { - this.filter = value; - } + } diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/ListMandatesRequest.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/ListMandatesRequest.java index 50374a1..94c65c0 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/ListMandatesRequest.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/ListMandatesRequest.java @@ -69,9 +69,9 @@ public class ListMandatesRequest { * *

* Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link MandateAttributesSearchFilterType }{@code >} * {@link JAXBElement }{@code <}{@link PaginationFilter }{@code >} * {@link JAXBElement }{@code <}{@link FilterType }{@code >} + * {@link JAXBElement }{@code <}{@link MandateAttributesSearchFilterType }{@code >} * {@link JAXBElement }{@code <}{@link MandateIDSearchFilterType }{@code >} * * @@ -89,8 +89,8 @@ public class ListMandatesRequest { * @return * possible object is * {@link JAXBElement }{@code <}{@link ProcessTypeOutputFilter }{@code >} - * {@link JAXBElement }{@code <}{@link OutputFilterType }{@code >} * {@link JAXBElement }{@code <}{@link ListReferencedMandatesOutputFilter }{@code >} + * {@link JAXBElement }{@code <}{@link OutputFilterType }{@code >} * */ public JAXBElement getOutputFilter() { @@ -103,8 +103,8 @@ public class ListMandatesRequest { * @param value * allowed object is * {@link JAXBElement }{@code <}{@link ProcessTypeOutputFilter }{@code >} - * {@link JAXBElement }{@code <}{@link OutputFilterType }{@code >} * {@link JAXBElement }{@code <}{@link ListReferencedMandatesOutputFilter }{@code >} + * {@link JAXBElement }{@code <}{@link OutputFilterType }{@code >} * */ public void setOutputFilter(JAXBElement value) { diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/ListMandatesResponseType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/ListMandatesResponseType.java index f47312e..1875dd4 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/ListMandatesResponseType.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/ListMandatesResponseType.java @@ -87,8 +87,8 @@ public class ListMandatesResponseType { * @return * possible object is * {@link JAXBElement }{@code <}{@link MandateList }{@code >} - * {@link JAXBElement }{@code <}{@link ReferencedMandatesResult }{@code >} * {@link JAXBElement }{@code <}{@link Object }{@code >} + * {@link JAXBElement }{@code <}{@link ReferencedMandatesResult }{@code >} * */ public JAXBElement getSearchResult() { @@ -101,8 +101,8 @@ public class ListMandatesResponseType { * @param value * allowed object is * {@link JAXBElement }{@code <}{@link MandateList }{@code >} - * {@link JAXBElement }{@code <}{@link ReferencedMandatesResult }{@code >} * {@link JAXBElement }{@code <}{@link Object }{@code >} + * {@link JAXBElement }{@code <}{@link ReferencedMandatesResult }{@code >} * */ public void setSearchResult(JAXBElement value) { diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/MandateAttributesSearchFilterType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/MandateAttributesSearchFilterType.java index b451c28..1f49372 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/MandateAttributesSearchFilterType.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/MandateAttributesSearchFilterType.java @@ -3,6 +3,7 @@ package at.gv.util.xsd.mis.usp_v2.eai.syncmsgs; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; @@ -21,25 +22,7 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="SearchCriteria"> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence maxOccurs="7"> - * <choice> - * <element name="ActivationRange" type="{http://eai.brz.gv.at/services/vdds/sync-msgs}TimeRangeType"/> - * <element name="MandateType" type="{http://reference.e-government.gv.at/namespace/mandates/20040701#}TextualDescriptionType"/> - * <element name="MandatorID" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}IdentificationType"/> - * <element name="RepresentativeID" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}IdentificationType"/> - * <element name="TerminationRange" type="{http://eai.brz.gv.at/services/vdds/sync-msgs}TimeRangeType"/> - * <element name="ValidFromTo" type="{http://eai.brz.gv.at/services/vdds/sync-msgs}TimeRangeType"/> - * <element ref="{http://reference.e-government.gv.at/namespace/mandates/20040701#}Properties"/> - * </choice> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </element> + * <element ref="{http://eai.brz.gv.at/services/vdds/sync-msgs}SearchCriteria"/> * </sequence> * </restriction> * </complexContent> @@ -54,10 +37,38 @@ import javax.xml.bind.annotation.XmlType; * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "MandateAttributesSearchFilterType") +@XmlType(name = "MandateAttributesSearchFilterType", propOrder = { + "filter" + }) public class MandateAttributesSearchFilterType extends FilterType { + @XmlElement(name = "Filter", required = true) + protected SearchCriteriaTestType filter; + + /** + * Ruft den Wert der filter-Eigenschaft ab. + * + * @return + * possible object is + * {@link Object } + * + */ + public SearchCriteriaTestType getFilter() { + return (SearchCriteriaTestType) filter; + } + + /** + * Legt den Wert der filter-Eigenschaft fest. + * + * @param value + * allowed object is + * {@link Object } + * + */ + public void setFilter(SearchCriteriaTestType value) { + this.filter = value; + } } diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/MandateIDSearchFilterType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/MandateIDSearchFilterType.java index 58a6b32..1d8ff63 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/MandateIDSearchFilterType.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/MandateIDSearchFilterType.java @@ -3,6 +3,7 @@ package at.gv.util.xsd.mis.usp_v2.eai.syncmsgs; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; @@ -46,10 +47,38 @@ import javax.xml.bind.annotation.XmlType; * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "MandateIDSearchFilterType") +@XmlType(name = "MandateIDSearchFilterType", propOrder = { + "filter" + }) public class MandateIDSearchFilterType extends FilterType { + @XmlElement(name = "Filter", required = true) + protected SearchCriteriaTestType filter; + + /** + * Ruft den Wert der filter-Eigenschaft ab. + * + * @return + * possible object is + * {@link Object } + * + */ + public SearchCriteriaTestType getFilter() { + return (SearchCriteriaTestType) filter; + } + + /** + * Legt den Wert der filter-Eigenschaft fest. + * + * @param value + * allowed object is + * {@link Object } + * + */ + public void setFilter(SearchCriteriaTestType value) { + this.filter = value; + } } diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/ObjectFactory.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/ObjectFactory.java index a015968..38ca081 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/ObjectFactory.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/ObjectFactory.java @@ -4,8 +4,11 @@ package at.gv.util.xsd.mis.usp_v2.eai.syncmsgs; import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlElementDecl; import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.namespace.QName; import at.gv.util.xsd.mis.usp_v2.eai.common.ReferableResultType; +import at.gv.util.xsd.mis.usp_v2.persondata.IdentificationType; /** @@ -25,6 +28,7 @@ import at.gv.util.xsd.mis.usp_v2.eai.common.ReferableResultType; @XmlRegistry public class ObjectFactory { + private final static QName _SearchCriteria_QNAME = new QName("http://eai.brz.gv.at/services/vdds/sync-msgs", "SearchCriteria"); private final static QName _CreateMandateAck_QNAME = new QName("http://eai.brz.gv.at/services/vdds/sync-msgs", "CreateMandateAck"); private final static QName _Result_QNAME = new QName("http://eai.brz.gv.at/services/vdds/sync-msgs", "Result"); private final static QName _CreateMandateRequest_QNAME = new QName("http://eai.brz.gv.at/services/vdds/sync-msgs", "CreateMandateRequest"); @@ -41,6 +45,12 @@ public class ObjectFactory { private final static QName _ReferencedMandatesResult_QNAME = new QName("http://eai.brz.gv.at/services/vdds/sync-msgs", "ReferencedMandatesResult"); private final static QName _TerminateMandateAck_QNAME = new QName("http://eai.brz.gv.at/services/vdds/sync-msgs", "TerminateMandateAck"); private final static QName _TerminateMandateRequest_QNAME = new QName("http://eai.brz.gv.at/services/vdds/sync-msgs", "TerminateMandateRequest"); + private final static QName _SearchCriteriaTypeActivationRange_QNAME = new QName("http://eai.brz.gv.at/services/vdds/sync-msgs", "ActivationRange"); + private final static QName _SearchCriteriaTypeMandateType_QNAME = new QName("http://eai.brz.gv.at/services/vdds/sync-msgs", "MandateType"); + private final static QName _SearchCriteriaTypeMandatorID_QNAME = new QName("http://eai.brz.gv.at/services/vdds/sync-msgs", "MandatorID"); + private final static QName _SearchCriteriaTypeRepresentativeID_QNAME = new QName("http://eai.brz.gv.at/services/vdds/sync-msgs", "RepresentativeID"); + private final static QName _SearchCriteriaTypeTerminationRange_QNAME = new QName("http://eai.brz.gv.at/services/vdds/sync-msgs", "TerminationRange"); + private final static QName _SearchCriteriaTypeValidFromTo_QNAME = new QName("http://eai.brz.gv.at/services/vdds/sync-msgs", "ValidFromTo"); /** * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.gv.util.xsd.mis.usp_v2.eai.syncmsgs @@ -65,6 +75,14 @@ public class ObjectFactory { return new SimplePath(); } + /** + * Create an instance of {@link SearchCriteriaType } + * + */ + public SearchCriteriaType createSearchCriteriaType() { + return new SearchCriteriaType(); + } + /** * Create an instance of {@link CreateMandateAsyncResponse } * @@ -201,6 +219,14 @@ public class ObjectFactory { return new TextProperties.Property(); } + /** + * Create an instance of {@link SearchCriteriaTestType } + * + */ + public SearchCriteriaTestType createSearchCriteriaTestType() { + return new SearchCriteriaTestType(); + } + /** * Create an instance of {@link MandateListType } * @@ -233,6 +259,15 @@ public class ObjectFactory { return new SimplePath.PathTo(); } + /** + * Create an instance of {@link JAXBElement }{@code <}{@link SearchCriteriaType }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://eai.brz.gv.at/services/vdds/sync-msgs", name = "SearchCriteria") + public JAXBElement createSearchCriteria(SearchCriteriaType value) { + return new JAXBElement(_SearchCriteria_QNAME, SearchCriteriaType.class, null, value); + } + /** * Create an instance of {@link JAXBElement }{@code <}{@link ReferableResultType }{@code >}} * @@ -377,4 +412,59 @@ public class ObjectFactory { return new JAXBElement(_TerminateMandateRequest_QNAME, MandateRequestType.class, null, value); } + /** + * Create an instance of {@link JAXBElement }{@code <}{@link TimeRangeType }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://eai.brz.gv.at/services/vdds/sync-msgs", name = "ActivationRange", scope = SearchCriteriaType.class) + public JAXBElement createSearchCriteriaTypeActivationRange(TimeRangeType value) { + return new JAXBElement(_SearchCriteriaTypeActivationRange_QNAME, TimeRangeType.class, SearchCriteriaType.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://eai.brz.gv.at/services/vdds/sync-msgs", name = "MandateType", scope = SearchCriteriaType.class) + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + public JAXBElement createSearchCriteriaTypeMandateType(String value) { + return new JAXBElement(_SearchCriteriaTypeMandateType_QNAME, String.class, SearchCriteriaType.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link IdentificationType }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://eai.brz.gv.at/services/vdds/sync-msgs", name = "MandatorID", scope = SearchCriteriaType.class) + public JAXBElement createSearchCriteriaTypeMandatorID(IdentificationType value) { + return new JAXBElement(_SearchCriteriaTypeMandatorID_QNAME, IdentificationType.class, SearchCriteriaType.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link IdentificationType }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://eai.brz.gv.at/services/vdds/sync-msgs", name = "RepresentativeID", scope = SearchCriteriaType.class) + public JAXBElement createSearchCriteriaTypeRepresentativeID(IdentificationType value) { + return new JAXBElement(_SearchCriteriaTypeRepresentativeID_QNAME, IdentificationType.class, SearchCriteriaType.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link TimeRangeType }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://eai.brz.gv.at/services/vdds/sync-msgs", name = "TerminationRange", scope = SearchCriteriaType.class) + public JAXBElement createSearchCriteriaTypeTerminationRange(TimeRangeType value) { + return new JAXBElement(_SearchCriteriaTypeTerminationRange_QNAME, TimeRangeType.class, SearchCriteriaType.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link TimeRangeType }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://eai.brz.gv.at/services/vdds/sync-msgs", name = "ValidFromTo", scope = SearchCriteriaType.class) + public JAXBElement createSearchCriteriaTypeValidFromTo(TimeRangeType value) { + return new JAXBElement(_SearchCriteriaTypeValidFromTo_QNAME, TimeRangeType.class, SearchCriteriaType.class, value); + } + } diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/PaginationFilter.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/PaginationFilter.java index 43db3b3..e17102d 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/PaginationFilter.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/PaginationFilter.java @@ -3,6 +3,7 @@ package at.gv.util.xsd.mis.usp_v2.eai.syncmsgs; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; @@ -36,10 +37,38 @@ import javax.xml.bind.annotation.XmlType; * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "") +@XmlType(name = "PaginationFilterType", propOrder = { + "filter" + }) public class PaginationFilter extends FilterType { + @XmlElement(name = "Filter", required = true) + protected PaginationType filter; + + /** + * Ruft den Wert der filter-Eigenschaft ab. + * + * @return + * possible object is + * {@link Object } + * + */ + public PaginationType getFilter() { + return (PaginationType) filter; + } + + /** + * Legt den Wert der filter-Eigenschaft fest. + * + * @param value + * allowed object is + * {@link Object } + * + */ + public void setFilter(PaginationType value) { + this.filter = value; + } } diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/PaginationType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/PaginationType.java new file mode 100644 index 0000000..21d6da8 --- /dev/null +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/PaginationType.java @@ -0,0 +1,43 @@ + +package at.gv.util.xsd.mis.usp_v2.eai.syncmsgs; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "PaginationType", propOrder = { + "pagination" +}) +public class PaginationType { + + @XmlElement(name = "Pagination", required = true) + protected Pagination pagination; + + /** + * Ruft den Wert der searchCriteria-Eigenschaft ab. + * + * @return + * possible object is + * {@link Pagination } + * + */ + public Pagination getPagination() { + return pagination; + } + + /** + * Legt den Wert der searchCriteria-Eigenschaft fest. + * + * @param value + * allowed object is + * {@link Pagination } + * + */ + public void setPagination(Pagination value) { + this.pagination = value; + } + +} diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/SearchCriteriaTestType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/SearchCriteriaTestType.java new file mode 100644 index 0000000..53fa3aa --- /dev/null +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/SearchCriteriaTestType.java @@ -0,0 +1,62 @@ + +package at.gv.util.xsd.mis.usp_v2.eai.syncmsgs; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

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

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

+ * <complexType name="SearchCriteriaTestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://eai.brz.gv.at/services/vdds/sync-msgs}SearchCriteria"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "SearchCriteriaType", propOrder = { + "searchCriteria" +}) +public class SearchCriteriaTestType { + + @XmlElement(name = "SearchCriteria", required = true) + protected SearchCriteriaType searchCriteria; + + /** + * Ruft den Wert der searchCriteria-Eigenschaft ab. + * + * @return + * possible object is + * {@link SearchCriteriaType } + * + */ + public SearchCriteriaType getSearchCriteria() { + return searchCriteria; + } + + /** + * Legt den Wert der searchCriteria-Eigenschaft fest. + * + * @param value + * allowed object is + * {@link SearchCriteriaType } + * + */ + public void setSearchCriteria(SearchCriteriaType value) { + this.searchCriteria = value; + } + +} diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/SearchCriteriaType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/SearchCriteriaType.java new file mode 100644 index 0000000..c09be79 --- /dev/null +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/eai/syncmsgs/SearchCriteriaType.java @@ -0,0 +1,97 @@ + +package at.gv.util.xsd.mis.usp_v2.eai.syncmsgs; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementRef; +import javax.xml.bind.annotation.XmlElementRefs; +import javax.xml.bind.annotation.XmlMixed; +import javax.xml.bind.annotation.XmlType; +import at.gv.util.xsd.mis.usp_v2.mandates.PropertiesType; +import at.gv.util.xsd.mis.usp_v2.persondata.IdentificationType; + + +/** + *

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

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

+ * <complexType name="SearchCriteriaType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="7">
+ *         <choice>
+ *           <element name="ActivationRange" type="{http://eai.brz.gv.at/services/vdds/sync-msgs}TimeRangeType"/>
+ *           <element name="MandateType" type="{http://reference.e-government.gv.at/namespace/mandates/20040701#}TextualDescriptionType"/>
+ *           <element name="MandatorID" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}IdentificationType"/>
+ *           <element name="RepresentativeID" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}IdentificationType"/>
+ *           <element name="TerminationRange" type="{http://eai.brz.gv.at/services/vdds/sync-msgs}TimeRangeType"/>
+ *           <element name="ValidFromTo" type="{http://eai.brz.gv.at/services/vdds/sync-msgs}TimeRangeType"/>
+ *           <element ref="{http://reference.e-government.gv.at/namespace/mandates/20040701#}Properties"/>
+ *         </choice>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "SearchCriteriaTestType", propOrder = { + "activationRangeOrMandateTypeOrMandatorID" +}) +public class SearchCriteriaType { + + @XmlElementRefs({ + @XmlElementRef(name = "ValidFromTo", namespace = "http://eai.brz.gv.at/services/vdds/sync-msgs", type = JAXBElement.class, required = false), + @XmlElementRef(name = "MandatorID", namespace = "http://eai.brz.gv.at/services/vdds/sync-msgs", type = JAXBElement.class, required = false), + @XmlElementRef(name = "ActivationRange", namespace = "http://eai.brz.gv.at/services/vdds/sync-msgs", type = JAXBElement.class, required = false), + @XmlElementRef(name = "RepresentativeID", namespace = "http://eai.brz.gv.at/services/vdds/sync-msgs", type = JAXBElement.class, required = false), + @XmlElementRef(name = "TerminationRange", namespace = "http://eai.brz.gv.at/services/vdds/sync-msgs", type = JAXBElement.class, required = false), + @XmlElementRef(name = "MandateType", namespace = "http://eai.brz.gv.at/services/vdds/sync-msgs", type = JAXBElement.class, required = false), + @XmlElementRef(name = "Properties", namespace = "http://reference.e-government.gv.at/namespace/mandates/20040701#", type = JAXBElement.class, required = false) + }) + protected List> activationRangeOrMandateTypeOrMandatorID; + + /** + * Gets the value of the activationRangeOrMandateTypeOrMandatorID 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 JAXB object. + * This is why there is not a set method for the activationRangeOrMandateTypeOrMandatorID property. + * + *

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

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

+ * Objects of the following type(s) are allowed in the list + * {@link JAXBElement }{@code <}{@link TimeRangeType }{@code >} + * {@link JAXBElement }{@code <}{@link IdentificationType }{@code >} + * {@link JAXBElement }{@code <}{@link TimeRangeType }{@code >} + * {@link JAXBElement }{@code <}{@link IdentificationType }{@code >} + * {@link JAXBElement }{@code <}{@link TimeRangeType }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link PropertiesType }{@code >} + * + * + */ + public List> getActivationRangeOrMandateTypeOrMandatorID() { + if (activationRangeOrMandateTypeOrMandatorID == null) { + activationRangeOrMandateTypeOrMandatorID = new ArrayList>(); + } + return this.activationRangeOrMandateTypeOrMandatorID; + } + +} diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/mandates/PropertiesType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/mandates/PropertiesType.java index 9b666d0..b2a921c 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/mandates/PropertiesType.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/mandates/PropertiesType.java @@ -117,8 +117,8 @@ public class PropertiesType { * *

* Objects of the following type(s) are allowed in the list - * {@link Object } * {@link Element } + * {@link Object } * * */ diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/mandates/SimpleMandateContentType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/mandates/SimpleMandateContentType.java index 8214f3c..31e425d 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/mandates/SimpleMandateContentType.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/mandates/SimpleMandateContentType.java @@ -76,8 +76,8 @@ import at.gv.util.xsd.mis.usp_v2.persondata.PhysicalPersonType; public class SimpleMandateContentType { @XmlElementRefs({ - @XmlElementRef(name = "ParameterisedDescription", namespace = "http://reference.e-government.gv.at/namespace/mandates/20040701#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "TextualDescription", namespace = "http://reference.e-government.gv.at/namespace/mandates/20040701#", type = JAXBElement.class, required = false) + @XmlElementRef(name = "TextualDescription", namespace = "http://reference.e-government.gv.at/namespace/mandates/20040701#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "ParameterisedDescription", namespace = "http://reference.e-government.gv.at/namespace/mandates/20040701#", type = JAXBElement.class, required = false) }) protected List> parameterisedDescriptionOrTextualDescription; @XmlElement(name = "References") @@ -113,8 +113,8 @@ public class SimpleMandateContentType { * *

* Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link ParameterisedDescriptionType }{@code >} * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link ParameterisedDescriptionType }{@code >} * * */ @@ -305,8 +305,8 @@ public class SimpleMandateContentType { @XmlElementRefs({ @XmlElementRef(name = "AnyConstraints", namespace = "http://reference.e-government.gv.at/namespace/mandates/20040701#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "PhysicalPerson", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "CorporateBody", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class, required = false) + @XmlElementRef(name = "CorporateBody", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "PhysicalPerson", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class, required = false) }) protected List> anyConstraintsOrCorporateBodyOrPhysicalPerson; @@ -328,8 +328,8 @@ public class SimpleMandateContentType { * *

* Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >} * {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >} + * {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >} * {@link JAXBElement }{@code <}{@link String }{@code >} * * diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/CompactCorporateBodyType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/CompactCorporateBodyType.java index 91d4790..65e255c 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/CompactCorporateBodyType.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/CompactCorporateBodyType.java @@ -188,8 +188,8 @@ public class CompactCorporateBodyType * *

* Objects of the following type(s) are allowed in the list - * {@link Object } * {@link Element } + * {@link Object } * * */ diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/CompactPersonDataType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/CompactPersonDataType.java index 788e738..2667836 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/CompactPersonDataType.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/CompactPersonDataType.java @@ -75,11 +75,11 @@ public class CompactPersonDataType * * @return * possible object is - * {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >} - * {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >} * {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >} * {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >} * {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >} + * {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >} + * {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >} * */ public JAXBElement getPerson() { @@ -91,11 +91,11 @@ public class CompactPersonDataType * * @param value * allowed object is - * {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >} - * {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >} * {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >} * {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >} * {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >} + * {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >} + * {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >} * */ public void setPerson(JAXBElement value) { @@ -120,12 +120,12 @@ public class CompactPersonDataType * *

* Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link AbstractAddressType }{@code >} - * {@link JAXBElement }{@code <}{@link CompactPostalAddressType }{@code >} + * {@link JAXBElement }{@code <}{@link TypedPostalAddressType }{@code >} * {@link JAXBElement }{@code <}{@link PostalAddressType }{@code >} - * {@link JAXBElement }{@code <}{@link TelephoneAddressType }{@code >} * {@link JAXBElement }{@code <}{@link InternetAddressType }{@code >} - * {@link JAXBElement }{@code <}{@link TypedPostalAddressType }{@code >} + * {@link JAXBElement }{@code <}{@link CompactPostalAddressType }{@code >} + * {@link JAXBElement }{@code <}{@link TelephoneAddressType }{@code >} + * {@link JAXBElement }{@code <}{@link AbstractAddressType }{@code >} * * */ @@ -237,8 +237,8 @@ public class CompactPersonDataType * *

* Objects of the following type(s) are allowed in the list - * {@link Object } * {@link Element } + * {@link Object } * {@link String } * * diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/CompactPhysicalPersonType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/CompactPhysicalPersonType.java index 23fa08a..a12e6d2 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/CompactPhysicalPersonType.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/CompactPhysicalPersonType.java @@ -243,8 +243,8 @@ public class CompactPhysicalPersonType * *

* Objects of the following type(s) are allowed in the list - * {@link Object } * {@link Element } + * {@link Object } * * */ diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/CorporateBodyType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/CorporateBodyType.java index 3c0b8a0..47219b0 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/CorporateBodyType.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/CorporateBodyType.java @@ -256,8 +256,8 @@ public class CorporateBodyType * *

* Objects of the following type(s) are allowed in the list - * {@link Object } * {@link Element } + * {@link Object } * * */ diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/IdentificationType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/IdentificationType.java index a485e83..5b2fe7b 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/IdentificationType.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/IdentificationType.java @@ -172,8 +172,8 @@ public class IdentificationType { * *

* Objects of the following type(s) are allowed in the list - * {@link Object } * {@link Element } + * {@link Object } * * */ diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/InternetAddressType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/InternetAddressType.java index 94662ff..ec46194 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/InternetAddressType.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/InternetAddressType.java @@ -121,8 +121,8 @@ public class InternetAddressType * *

* Objects of the following type(s) are allowed in the list - * {@link Object } * {@link Element } + * {@link Object } * * */ diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/NationalityType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/NationalityType.java index 0a5e13e..383ca3d 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/NationalityType.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/NationalityType.java @@ -52,10 +52,10 @@ import org.w3c.dom.Element; public class NationalityType { @XmlElementRefs({ - @XmlElementRef(name = "CountryNameFR", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class), @XmlElementRef(name = "ISOCode3", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class), - @XmlElementRef(name = "CountryNameEN", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class), - @XmlElementRef(name = "CountryNameDE", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class) + @XmlElementRef(name = "CountryNameDE", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class), + @XmlElementRef(name = "CountryNameFR", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class), + @XmlElementRef(name = "CountryNameEN", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class) }) @XmlMixed @XmlAnyElement(lax = true) @@ -79,13 +79,13 @@ public class NationalityType { * *

* Objects of the following type(s) are allowed in the list - * {@link Element } * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link Object } + * {@link String } + * {@link Element } * {@link JAXBElement }{@code <}{@link String }{@code >} * {@link JAXBElement }{@code <}{@link String }{@code >} * {@link JAXBElement }{@code <}{@link String }{@code >} - * {@link Object } - * {@link String } * * */ diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/PersonDataType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/PersonDataType.java index 1c81b4d..f160a2f 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/PersonDataType.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/PersonDataType.java @@ -75,11 +75,11 @@ public class PersonDataType * * @return * possible object is - * {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >} - * {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >} * {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >} * {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >} * {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >} + * {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >} + * {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >} * */ public JAXBElement getPerson() { @@ -91,11 +91,11 @@ public class PersonDataType * * @param value * allowed object is - * {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >} - * {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >} * {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >} * {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >} * {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >} + * {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >} + * {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >} * */ public void setPerson(JAXBElement value) { @@ -120,12 +120,12 @@ public class PersonDataType * *

* Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link AbstractAddressType }{@code >} - * {@link JAXBElement }{@code <}{@link CompactPostalAddressType }{@code >} + * {@link JAXBElement }{@code <}{@link TypedPostalAddressType }{@code >} * {@link JAXBElement }{@code <}{@link PostalAddressType }{@code >} - * {@link JAXBElement }{@code <}{@link TelephoneAddressType }{@code >} * {@link JAXBElement }{@code <}{@link InternetAddressType }{@code >} - * {@link JAXBElement }{@code <}{@link TypedPostalAddressType }{@code >} + * {@link JAXBElement }{@code <}{@link CompactPostalAddressType }{@code >} + * {@link JAXBElement }{@code <}{@link TelephoneAddressType }{@code >} + * {@link JAXBElement }{@code <}{@link AbstractAddressType }{@code >} * * */ @@ -237,8 +237,8 @@ public class PersonDataType * *

* Objects of the following type(s) are allowed in the list - * {@link Object } * {@link Element } + * {@link Object } * {@link String } * * diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/PhysicalPersonType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/PhysicalPersonType.java index e199dfb..64a83a5 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/PhysicalPersonType.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/PhysicalPersonType.java @@ -488,8 +488,8 @@ public class PhysicalPersonType * *

* Objects of the following type(s) are allowed in the list - * {@link Object } * {@link Element } + * {@link Object } * * */ diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/TelephoneAddressType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/TelephoneAddressType.java index 42eed66..61e3d75 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/TelephoneAddressType.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/TelephoneAddressType.java @@ -125,8 +125,8 @@ public class TelephoneAddressType * *

* Objects of the following type(s) are allowed in the list - * {@link Object } * {@link Element } + * {@link Object } * * */ diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/TypedPostalAddressType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/TypedPostalAddressType.java index 75b2c09..3f7a659 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/TypedPostalAddressType.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/persondata/TypedPostalAddressType.java @@ -120,8 +120,8 @@ public class TypedPostalAddressType * *

* Objects of the following type(s) are allowed in the list - * {@link Object } * {@link Element } + * {@link Object } * * */ diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/DigestMethodType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/DigestMethodType.java index 0274215..4136a2d 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/DigestMethodType.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/DigestMethodType.java @@ -64,8 +64,8 @@ public class DigestMethodType { * *

* Objects of the following type(s) are allowed in the list - * {@link Object } * {@link Element } + * {@link Object } * {@link String } * * diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/KeyInfoType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/KeyInfoType.java index 8a5bec4..b32a783 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/KeyInfoType.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/KeyInfoType.java @@ -53,13 +53,13 @@ import org.w3c.dom.Element; public class KeyInfoType { @XmlElementRefs({ - @XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "PGPData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), @XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), @XmlElementRef(name = "X509Data", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "KeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), @XmlElementRef(name = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "KeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) + @XmlElementRef(name = "PGPData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) }) @XmlMixed @XmlAnyElement(lax = true) @@ -88,16 +88,16 @@ public class KeyInfoType { * *

* Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >} + * {@link Object } + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link String } * {@link Element } - * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >} * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >} * {@link JAXBElement }{@code <}{@link X509DataType }{@code >} - * {@link JAXBElement }{@code <}{@link String }{@code >} - * {@link Object } - * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >} * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >} - * {@link String } + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >} * * */ diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/KeyValueType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/KeyValueType.java index ff873e0..e89715e 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/KeyValueType.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/KeyValueType.java @@ -42,8 +42,8 @@ import org.w3c.dom.Element; public class KeyValueType { @XmlElementRefs({ - @XmlElementRef(name = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) + @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) }) @XmlMixed @XmlAnyElement(lax = true) @@ -67,11 +67,11 @@ public class KeyValueType { * *

* Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >} - * {@link Element } - * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >} * {@link Object } * {@link String } + * {@link Element } + * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >} + * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >} * * */ diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/ObjectType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/ObjectType.java index d1d716d..5c1ebf8 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/ObjectType.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/ObjectType.java @@ -76,8 +76,8 @@ public class ObjectType { * *

* Objects of the following type(s) are allowed in the list - * {@link Object } * {@link Element } + * {@link Object } * {@link String } * * diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/PGPDataType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/PGPDataType.java index 9b1c1b8..6d2b209 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/PGPDataType.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/PGPDataType.java @@ -82,9 +82,9 @@ public class PGPDataType { *

* Objects of the following type(s) are allowed in the list * {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * {@link Element } - * {@link Object } * {@link JAXBElement }{@code <}{@link byte[]}{@code >} + * {@link Object } + * {@link Element } * * */ diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/SPKIDataType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/SPKIDataType.java index c0a6931..5cd9d4e 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/SPKIDataType.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/SPKIDataType.java @@ -60,9 +60,9 @@ public class SPKIDataType { * *

* Objects of the following type(s) are allowed in the list + * {@link Element } * {@link JAXBElement }{@code <}{@link byte[]}{@code >} * {@link Object } - * {@link Element } * * */ diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/SignatureMethodType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/SignatureMethodType.java index 12cb706..92cd0d8 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/SignatureMethodType.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/SignatureMethodType.java @@ -68,8 +68,8 @@ public class SignatureMethodType { * *

* Objects of the following type(s) are allowed in the list - * {@link Object } * {@link JAXBElement }{@code <}{@link BigInteger }{@code >} + * {@link Object } * {@link String } * * diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/SignaturePropertyType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/SignaturePropertyType.java index e6b1f69..078ff11 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/SignaturePropertyType.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/SignaturePropertyType.java @@ -73,8 +73,8 @@ public class SignaturePropertyType { * *

* Objects of the following type(s) are allowed in the list - * {@link Object } * {@link Element } + * {@link Object } * {@link String } * * diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/TransformType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/TransformType.java index e98f7ec..a17e181 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/TransformType.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/TransformType.java @@ -68,10 +68,10 @@ public class TransformType { * *

* Objects of the following type(s) are allowed in the list - * {@link Element } - * {@link JAXBElement }{@code <}{@link String }{@code >} * {@link Object } + * {@link JAXBElement }{@code <}{@link String }{@code >} * {@link String } + * {@link Element } * * */ diff --git a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/X509DataType.java b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/X509DataType.java index b40cf7d..f32cae5 100644 --- a/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/X509DataType.java +++ b/src/main/java/at/gv/util/xsd/mis/usp_v2/xmldsig/X509DataType.java @@ -46,11 +46,11 @@ import org.w3c.dom.Element; public class X509DataType { @XmlElementRefs({ - @XmlElementRef(name = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), @XmlElementRef(name = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "X509CRL", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), @XmlElementRef(name = "X509Certificate", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "X509SKI", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) + @XmlElementRef(name = "X509SKI", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "X509CRL", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) }) @XmlAnyElement(lax = true) protected List x509CRLOrX509CertificateOrX509IssuerSerial; @@ -73,13 +73,13 @@ public class X509DataType { * *

* Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >} + * {@link Object } * {@link Element } * {@link JAXBElement }{@code <}{@link String }{@code >} * {@link JAXBElement }{@code <}{@link byte[]}{@code >} * {@link JAXBElement }{@code <}{@link byte[]}{@code >} * {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * {@link Object } + * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >} * * */ -- cgit v1.2.3