reusable expression fiunctions - work in progress

Evolveum · Oct 18, 2017 · e4dff81 · e4dff81
1 parent 97b8989
commit e4dff81
Showing 1 changed file with 51 additions and 28 deletions.
diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
@@ -6937,7 +6937,28 @@
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
+        	<xsd:element name="name" type="xsd:string" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>
+						Name of the function
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
             <xsd:element ref="tns:description" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="parameter" type="tns:ExpressionParameterType" minOccurs="0" maxOccurs="unbounded">
+				<xsd:annotation>
+					<xsd:documentation>
+						Function input parameters
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="returnType" type="xsd:QName" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>
+						Name of the function
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
             <xsd:element ref="tns:extension" minOccurs="0" maxOccurs="1"/>
             <xsd:element name="trace" type="xsd:boolean" minOccurs="0" maxOccurs="1">
             	<xsd:annotation>
@@ -7011,6 +7032,34 @@
         </xsd:annotation>
     </xsd:element>
 
+    <xsd:complexType name="ExpressionParameterType">
+    	<xsd:annotation>
+    		<xsd:documentation>
+    			Describes input parameters to the expression. 
+    		</xsd:documentation>
+    		<xsd:appinfo>
+    			<a:since>3.7</a:since>
+    			<a:container/>
+    		</xsd:appinfo>
+    	</xsd:annotation>
+    	<xsd:sequence>
+    		<xsd:element name="name" type="xsd:string" minOccurs="0">
+    			<xsd:annotation>
+    				<xsd:documentation>
+    					Name of the parameter
+    				</xsd:documentation>
+    			</xsd:annotation>
+    		</xsd:element>
+    		<xsd:element name="type" type="xsd:QName" minOccurs="0">
+    			<xsd:annotation>
+    				<xsd:documentation>
+    					Parameter type
+    				</xsd:documentation>
+    			</xsd:annotation>
+    		</xsd:element>
+    	</xsd:sequence>
+    </xsd:complexType>
+
     <xsd:simpleType name="ExpressionReturnMultiplicityType">
         <xsd:annotation>
             <xsd:documentation>
@@ -11671,40 +11720,14 @@
 		 <xsd:complexContent>
             <xsd:extension base="c:ObjectType">
                 <xsd:sequence>
-                	<xsd:element name="function" type="tns:FunctionType" minOccurs="0" maxOccurs="unbounded"/>
+                	<xsd:element name="function" type="tns:ExpressionType" minOccurs="0" maxOccurs="unbounded"/>
             	</xsd:sequence>
             </xsd:extension>
        </xsd:complexContent>
 	</xsd:complexType>
 	<xsd:element name="functionLibrary" type="tns:FunctionLibraryType" substitutionGroup="c:object"/>
 
-	<xsd:complexType name="FunctionType">
-		<xsd:annotation>
-			<xsd:documentation>
-				Describe function's name, parameters, return statement, ...
-			</xsd:documentation>
-			<xsd:appinfo>
-				<a:container/>
-				<a:since>3.7</a:since>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:element name="name" type="xsd:string" minOccurs="1">
-				<xsd:annotation>
-					<xsd:documentation>
-						Name of the function
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-			<xsd:element name="body" type="tns:ExpressionType" minOccurs="0">
-				<xsd:annotation>
-					<xsd:documentation>
-						Defines the body of the function.
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-		</xsd:sequence>
-	</xsd:complexType>
+
 
 	<xsd:complexType name="InternalsConfigurationType">
         <xsd:annotation>