Skip to content

Commit

Permalink
common-notifications-3: removed obsolete forked and chained elements
Browse files Browse the repository at this point in the history
  • Loading branch information
@virgo47
virgo47 committed Aug 24, 2022
1 parent 345d4f0 commit 9ba3aeb
Show file tree
Hide file tree
Showing 14 changed files with 279 additions and 486 deletions.
37 changes: 3 additions & 34 deletions infra/schema/src/main/resources/xml/ns/public/common/common-notifications-3.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -930,8 +930,7 @@
<xsd:documentation>
An event handler type - extends common handler with filter/info
and additionally can contain one or more notifiers of various kinds.

Forked/chained elements are deprecated, implicit behavior of multiple notifiers is "forked".
Each notifier is considered and multiple of them can be used, if not filtered out.
</xsd:documentation>
<xsd:appinfo>
<a:container/>
Expand All @@ -940,36 +939,6 @@
<xsd:complexContent>
<xsd:extension base="tns:BaseEventHandlerType">
<xsd:sequence>
<xsd:element name="chained" type="tns:EventHandlerType" minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>
A chain of handlers (usually filters and notifiers) to be evaluated, one after another.

DEPRECATED: Configuration can be rewritten without it, probably more clearly.
</xsd:documentation>
<xsd:appinfo>
<a:deprecated>true</a:deprecated>
<a:deprecatedSince>4.5</a:deprecatedSince>
<a:plannedRemoval>4.6</a:plannedRemoval>
<a:elaborate>true</a:elaborate>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="forked" type="tns:EventHandlerType" minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>
A set of handlers to be evaluated without any relation among them (like a fork prongs).

DEPRECATED: Just use multiple notifiers in a handler directly to the same effect.
</xsd:documentation>
<xsd:appinfo>
<a:deprecated>true</a:deprecated>
<a:deprecatedSince>4.5</a:deprecatedSince>
<a:plannedRemoval>4.6</a:plannedRemoval>
<a:elaborate>true</a:elaborate>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="simpleUserNotifier" type="tns:SimpleUserNotifierType" minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>
Expand Down Expand Up @@ -1501,15 +1470,15 @@
</xsd:annotation>
</xsd:element>
<xsd:element name="transport" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
<!-- TODO Hopefully in 4.6, implementation support wasn't finished in 4.5
<!-- TODO Later, implementation support wasn't finished in 4.5
<xsd:element name="transportConfig" type="tns:NotifierTransportConfigType" minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>
More expressive version of `transport` element that allows also customizing
template per transport.
</xsd:documentation>
<xsd:appinfo>
<a:since>4.6</a:since>
<a:since>TODO</a:since>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down
46 changes: 19 additions & 27 deletions model/model-intest/src/test/resources/archetypes/system-configuration-archetypes.xml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
~ Copyright (c) 2010-2018 Evolveum and contributors
~ Copyright (C) 2010-2022 Evolveum and contributors
~
~ This work is dual-licensed under the Apache License 2.0
~ and European Union Public License. See LICENSE file for details.
-->

<systemConfiguration oid="00000000-0000-0000-0000-000000000001" version="0"
xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3">
xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3">

<name>SystemConfiguration</name>
<globalSecurityPolicyRef oid="28bf845a-b107-11e3-85bc-001e8c717e5b"/>
<logging>
Expand All @@ -18,7 +18,7 @@
<classLogger>
<level>TRACE</level>
<package>com.evolveum.midpoint.common.LoggingConfigurationManager</package>
</classLogger>
</classLogger>
<c:classLogger>
<c:level>TRACE</c:level>
<c:package>com.evolveum.midpoint.notifications</c:package>
Expand Down Expand Up @@ -115,30 +115,22 @@
</simpleUserNotifier>
</handler>
<handler>
<chained>
<operation>add</operation>
</chained>
<chained>
<simpleUserNotifier>
<recipientExpression>
<value>recipient@evolveum.com</value>
</recipientExpression>
<transport>dummy:simpleUserNotifier-ADD</transport>
</simpleUserNotifier>
</chained>
<operation>add</operation>
<simpleUserNotifier>
<recipientExpression>
<value>recipient@evolveum.com</value>
</recipientExpression>
<transport>dummy:simpleUserNotifier-ADD</transport>
</simpleUserNotifier>
</handler>
<handler>
<chained>
<operation>delete</operation>
</chained>
<chained>
<simpleUserNotifier>
<recipientExpression>
<value>recipient@evolveum.com</value>
</recipientExpression>
<transport>dummy:simpleUserNotifier-DELETE</transport>
</simpleUserNotifier>
</chained>
<operation>delete</operation>
<simpleUserNotifier>
<recipientExpression>
<value>recipient@evolveum.com</value>
</recipientExpression>
<transport>dummy:simpleUserNotifier-DELETE</transport>
</simpleUserNotifier>
</handler>
<handler>
<status>failure</status>
Expand Down
38 changes: 15 additions & 23 deletions model/model-intest/src/test/resources/common/system-configuration.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
~ Copyright (C) 2010-2021 Evolveum and contributors
~ Copyright (C) 2010-2022 Evolveum and contributors
~
~ This work is dual-licensed under the Apache License 2.0
~ and European Union Public License. See LICENSE file for details.
Expand Down Expand Up @@ -113,30 +113,22 @@
</simpleUserNotifier>
</handler>
<handler>
<chained>
<operation>add</operation>
</chained>
<chained>
<simpleUserNotifier>
<recipientExpression>
<value>recipient@evolveum.com</value>
</recipientExpression>
<transport>dummy:simpleUserNotifier-ADD</transport>
</simpleUserNotifier>
</chained>
<operation>add</operation>
<simpleUserNotifier>
<recipientExpression>
<value>recipient@evolveum.com</value>
</recipientExpression>
<transport>dummy:simpleUserNotifier-ADD</transport>
</simpleUserNotifier>
</handler>
<handler>
<chained>
<operation>delete</operation>
</chained>
<chained>
<simpleUserNotifier>
<recipientExpression>
<value>recipient@evolveum.com</value>
</recipientExpression>
<transport>dummy:simpleUserNotifier-DELETE</transport>
</simpleUserNotifier>
</chained>
<operation>delete</operation>
<simpleUserNotifier>
<recipientExpression>
<value>recipient@evolveum.com</value>
</recipientExpression>
<transport>dummy:simpleUserNotifier-DELETE</transport>
</simpleUserNotifier>
</handler>
<handler>
<status>failure</status>
Expand Down
111 changes: 52 additions & 59 deletions model/model-intest/src/test/resources/lifecycle/system-configuration-lifecycle.xml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
~ Copyright (c) 2010-2017 Evolveum and contributors
~ Copyright (C) 2010-2022 Evolveum and contributors
~
~ This work is dual-licensed under the Apache License 2.0
~ and European Union Public License. See LICENSE file for details.
-->

<systemConfiguration oid="00000000-0000-0000-0000-000000000001" version="0"
xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3">
xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3">

<name>SystemConfiguration</name>
<globalSecurityPolicyRef oid="28bf845a-b107-11e3-85bc-001e8c717e5b"/>
<logging>
Expand All @@ -18,7 +19,7 @@
<classLogger>
<level>TRACE</level>
<package>com.evolveum.midpoint.common.LoggingConfigurationManager</package>
</classLogger>
</classLogger>
<c:classLogger>
<c:level>TRACE</c:level>
<c:package>com.evolveum.midpoint.notifications</c:package>
Expand All @@ -33,11 +34,11 @@
<defaultObjectPolicyConfiguration>
<type>UserType</type>
<subtype>employee</subtype>
<lifecycleStateModel>
<state>
<name>proposed</name>
<!-- no forcedActivationStatus, changing the default to undefined -->
<forcedAssignment>
<lifecycleStateModel>
<state>
<name>proposed</name>
<!-- no forcedActivationStatus, changing the default to undefined -->
<forcedAssignment>
<targetType>RoleType</targetType>
<filter>
<q:equal>
Expand All @@ -46,20 +47,20 @@
<q:value>pit boss</q:value>
</q:equal>
</filter>
</forcedAssignment>
</state>
<state>
<name>active</name>
<transition>
<name>archival</name>
<targetState>archived</targetState>
<condition>
<script>
<code>!midpoint.hasActiveAssignmentTargetSubtype('dataProcessingBasis')</code>
</script>
</condition>
</transition>
<forcedAssignment>
</forcedAssignment>
</state>
<state>
<name>active</name>
<transition>
<name>archival</name>
<targetState>archived</targetState>
<condition>
<script>
<code>!midpoint.hasActiveAssignmentTargetSubtype('dataProcessingBasis')</code>
</script>
</condition>
</transition>
<forcedAssignment>
<targetType>RoleType</targetType>
<filter>
<q:equal>
Expand All @@ -68,19 +69,19 @@
<q:value>Pirate Green</q:value>
</q:equal>
</filter>
</forcedAssignment>
</state>
<state>
<name>archived</name>
<forcedActivationStatus>archived</forcedActivationStatus>
<entryAction>
<name>archival-data-reduction</name>
<dataReduction>
<purgeItem>telephoneNumber</purgeItem>
</dataReduction>
</entryAction>
</state>
</lifecycleStateModel>
</forcedAssignment>
</state>
<state>
<name>archived</name>
<forcedActivationStatus>archived</forcedActivationStatus>
<entryAction>
<name>archival-data-reduction</name>
<dataReduction>
<purgeItem>telephoneNumber</purgeItem>
</dataReduction>
</entryAction>
</state>
</lifecycleStateModel>
</defaultObjectPolicyConfiguration>

<notificationConfiguration>
Expand Down Expand Up @@ -166,30 +167,22 @@
</simpleUserNotifier>
</handler>
<handler>
<chained>
<operation>add</operation>
</chained>
<chained>
<simpleUserNotifier>
<recipientExpression>
<value>recipient@evolveum.com</value>
</recipientExpression>
<transport>dummy:simpleUserNotifier-ADD</transport>
</simpleUserNotifier>
</chained>
<operation>add</operation>
<simpleUserNotifier>
<recipientExpression>
<value>recipient@evolveum.com</value>
</recipientExpression>
<transport>dummy:simpleUserNotifier-ADD</transport>
</simpleUserNotifier>
</handler>
<handler>
<chained>
<operation>delete</operation>
</chained>
<chained>
<simpleUserNotifier>
<recipientExpression>
<value>recipient@evolveum.com</value>
</recipientExpression>
<transport>dummy:simpleUserNotifier-DELETE</transport>
</simpleUserNotifier>
</chained>
<operation>delete</operation>
<simpleUserNotifier>
<recipientExpression>
<value>recipient@evolveum.com</value>
</recipientExpression>
<transport>dummy:simpleUserNotifier-DELETE</transport>
</simpleUserNotifier>
</handler>
<handler>
<status>failure</status>
Expand Down

0 comments on commit 9ba3aeb

Please sign in to comment.