MID-7487: schema changes, template has only content type (no expression)

New transportConfig element in notificationConfiguration removed for 4.5
Evolveum · Feb 24, 2022 · 39fc14e · 39fc14e
1 parent b699806
commit 39fc14e
Showing 1 changed file with 14 additions and 21 deletions.
diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-notifications-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-notifications-3.xsd
@@ -33,7 +33,7 @@
 
     <!-- region persistent objects/containers -->
     <!--
-    TODO: Can this fully replace NotificationMessageType? It better does. Planned AFTER MessageTemplates (lower).
+    TODO: Can this fully replace NotificationMessageType? It better does. Not-planned for 4.5.
     See: https://docs.evolveum.com/midpoint/projects/idmatch/notification-hypo-design/
     <xsd:complexType name="MessageType">
         <xsd:annotation>
@@ -154,16 +154,6 @@
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
-            <xsd:element name="contentTypeExpression" type="c:ExpressionType" minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        Expression returning body content type, e.g. text/plain (the default), text/html, and so on.
-                    </xsd:documentation>
-                    <xsd:appinfo>
-                        <a:displayName>MessageTemplateContentType.contentTypeExpression</a:displayName>
-                    </xsd:appinfo>
-                </xsd:annotation>
-            </xsd:element>
             <xsd:element name="attachment" type="tns:NotificationMessageAttachmentType" minOccurs="0" maxOccurs="unbounded">
                 <xsd:annotation>
                     <xsd:documentation>
@@ -408,7 +398,7 @@
                 Configuration of a particular mail server host.
             </xsd:documentation>
             <xsd:appinfo>
-                <!--TODO: causes NPE TestCryptoUtil in mail.getServer().get(0).getPassword() returns value that returns null for getEncryptedDataType() -->
+                <!-- Causes NPE TestCryptoUtil in mail.getServer().get(0).getPassword() returns value that returns null for getEncryptedDataType() -->
                 <!--<a:container/>-->
                 <a:displayName>MailServerConfigurationType.details</a:displayName>
             </xsd:appinfo>
@@ -780,7 +770,6 @@
         </xsd:annotation>
         <xsd:sequence>
             <xsd:element name="handler" type="tns:EventHandlerType" minOccurs="0" maxOccurs="unbounded"/> <!-- implicit fork -->
-            <!-- TODO add notificationTransportConfiguration section for notification specific config. -->
 
             <!-- Left for compatibility, but use new messageTransportConfiguration. -->
             <xsd:element name="mail" type="tns:MailConfigurationType" minOccurs="0">
@@ -821,6 +810,8 @@
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
+
+            <!-- TODO: currently disabled, support not implemented in 4.5, use global transport configuration instead.
             <xsd:element name="transportConfig" type="tns:NotificationTransportConfigType" minOccurs="0" maxOccurs="unbounded">
                 <xsd:annotation>
                     <xsd:documentation>
@@ -832,6 +823,7 @@
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
+            -->
         </xsd:sequence>
     </xsd:complexType>
     <xsd:element name="notificationConfiguration" type="tns:NotificationConfigurationType"/>
@@ -1406,13 +1398,6 @@
                             </xsd:appinfo>
                         </xsd:annotation>
                     </xsd:element>
-                    <xsd:element name="contentTypeExpression" type="c:ExpressionType" minOccurs="0">
-                        <xsd:annotation>
-                            <xsd:documentation>
-                                contentType used in email
-                            </xsd:documentation>
-                        </xsd:annotation>
-                    </xsd:element>
                     <xsd:element name="subjectExpression" type="c:ExpressionType" minOccurs="0">
                         <xsd:annotation>
                             <xsd:documentation>
@@ -1442,6 +1427,14 @@
                             </xsd:documentation>
                         </xsd:annotation>
                     </xsd:element>
+                    <xsd:element name="contentTypeExpression" type="c:ExpressionType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Body content type, e.g. text/plain (the default), text/html, and so on - specified as expression.
+                                If `contentType` element is used, this one is ignored.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
                     <xsd:element name="attachment" type="tns:NotificationMessageAttachmentType" minOccurs="0" maxOccurs="unbounded">
                         <xsd:annotation>
                             <xsd:documentation>
@@ -1511,7 +1504,6 @@
                 Type for recipient expression, which can be either a focus or a string.
                 Focus can be returned as FocusObject directly or wrapped in PrismObject.
                 This is an internal structure to support multiple return types for recipient.
-                <!-- TODO any other supported return type for focus? SimpleObjectRef? Other kind of ref? -->
             </xsd:documentation>
             <xsd:appinfo>
                 <a:since>4.5</a:since>
@@ -1544,6 +1536,7 @@
         <xsd:annotation>
             <xsd:documentation>
                 Type for more descriptive message transport declaration inside notifiers.
+                Enables the transport for the notifier, the `transport` element with the same name is not necessary.
             </xsd:documentation>
             <xsd:appinfo>
                 <a:since>4.5</a:since>