foo.xsd: Make ObjectReference use SearchFilterType

Evolveum · Feb 3, 2021 · f36159f · f36159f
1 parent 47f72b8
commit f36159f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/infra/prism-impl/src/main/resources/xml/ns/test/foo-1.xsd b/infra/prism-impl/src/main/resources/xml/ns/test/foo-1.xsd
@@ -12,6 +12,7 @@
             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
             xmlns:a="http://prism.evolveum.com/xml/ns/public/annotation-3"
             xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
+            xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3"
             xmlns:ft="http://midpoint.evolveum.com/xml/ns/test/foo-types-1"
             xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
@@ -32,6 +33,8 @@
         </xsd:appinfo>
     </xsd:annotation>
 
+    <xsd:import namespace="http://prism.evolveum.com/xml/ns/public/query-3" schemaLocation="http://prism.evolveum.com/xml/ns/public/query-3" />
+
     <xsd:import namespace="http://prism.evolveum.com/xml/ns/public/types-3" schemaLocation="http://prism.evolveum.com/xml/ns/public/types-3">
         <xsd:annotation>
             <xsd:documentation>
@@ -202,19 +205,14 @@
                     </xsd:documentation>
                 </xsd:annotation>
             </xsd:element>
-            <xsd:element name="filter" minOccurs="0" maxOccurs="1">
+            <xsd:element name="filter" minOccurs="0" maxOccurs="1" type="q:SearchFilterType">
                 <xsd:annotation>
                     <xsd:documentation>
                         Filter that can be used to dynamically lookup the reference OID e.g. during imports.
                         It must not be used for normal operations and references with the filter must not
                         be stored in the repository.
                     </xsd:documentation>
                 </xsd:annotation>
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
-                    </xsd:sequence>
-                </xsd:complexType>
             </xsd:element>
             <xsd:element name="object" minOccurs="0" maxOccurs="1">
                 <xsd:complexType>

diff --git a/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/ObjectType.java b/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/ObjectType.java
@@ -60,7 +60,7 @@ public abstract class ObjectType
 {
 
     // This is NOT GENERATED. It is supplied here manually for the testing.
-    static final String NS_FOO = "http://midpoint.evolveum.com/xml/ns/test/foo-1.xsd";
+    public static final String NS_FOO = "http://midpoint.evolveum.com/xml/ns/test/foo-1.xsd";
 
     // This is NOT GENERATED. It is supplied here manually for the testing.
     public static final ItemName F_NAME = new ItemName(NS_FOO, "name");
@@ -86,6 +86,7 @@ public abstract class ObjectType
      *     {@link String }
      *
      */
+    @Override
     public PolyStringType getName() {
         return name;
     }
@@ -98,6 +99,7 @@ public PolyStringType getName() {
      *     {@link String }
      *
      */
+    @Override
     public void setName(PolyStringType value) {
         this.name = value;
     }
@@ -110,6 +112,7 @@ public void setName(PolyStringType value) {
      *     {@link String }
      *
      */
+    @Override
     public String getDescription() {
         return description;
     }
@@ -122,6 +125,7 @@ public String getDescription() {
      *     {@link String }
      *
      */
+    @Override
     public void setDescription(String value) {
         this.description = value;
     }
@@ -158,6 +162,7 @@ public void setExtension(Extension value) {
      *     {@link String }
      *
      */
+    @Override
     public String getOid() {
         return oid;
     }
@@ -170,6 +175,7 @@ public String getOid() {
      *     {@link String }
      *
      */
+    @Override
     public void setOid(String value) {
         this.oid = value;
     }
@@ -182,6 +188,7 @@ public void setOid(String value) {
      *     {@link String }
      *
      */
+    @Override
     public String getVersion() {
         return version;
     }
@@ -194,6 +201,7 @@ public String getVersion() {
      *     {@link String }
      *
      */
+    @Override
     public void setVersion(String value) {
         this.version = value;
     }