Skip to content

Commit

Permalink
schema: ResourceConsistencyType.reshreshOnRead -> refreshOnRead
Browse files Browse the repository at this point in the history
  • Loading branch information
@virgo47
virgo47 committed Apr 11, 2022
1 parent c64bc2b commit b43da8a
Show file tree
Hide file tree
Showing 16 changed files with 320 additions and 398 deletions.
141 changes: 51 additions & 90 deletions infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
View file

Large diffs are not rendered by default.

22 changes: 8 additions & 14 deletions infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4255,6 +4255,12 @@
<a:version>4.0</a:version>
<a:operation>removed</a:operation>
</a:schemaMigration>
<a:schemaMigration>
<a:element>tns:reshreshOnRead</a:element>
<a:version>4.6</a:version>
<a:operation>moved</a:operation>
<a:replacement>tns:refreshOnRead</a:replacement>
</a:schemaMigration>
</xsd:appinfo>
</xsd:annotation>
<xsd:sequence>
Expand Down Expand Up @@ -4398,7 +4404,7 @@
EXPERIMENTAL: use with care.

Use of this option may be DANGEROUS. Especially when used to set generic errors as non-critical.
Generic errors means that midPoint has absolutely no idea what is going on. Otherwise the
Generic error means that midPoint has absolutely no idea what is going on. Otherwise the
error would be classified to a more specific category. Continuing an operation where midPoint
has no idea what is going on may have severe consequences. The results are unpredictable.
If you use this setting then you are on your own. Hic sunt leones.
Expand Down Expand Up @@ -4469,18 +4475,6 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="reshreshOnRead" type="xsd:boolean" minOccurs="0" default="false">
<xsd:annotation>
<xsd:documentation>
WARNING: There is a this property. Use the correct form "refreshOnRead" instead.
</xsd:documentation>
<xsd:appinfo>
<a:since>3.9</a:since>
<a:deprecated>true</a:deprecated>
<a:deprecatedSince>4.3</a:deprecatedSince>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="refreshOnRead" type="xsd:boolean" minOccurs="0" default="false">
<xsd:annotation>
<xsd:documentation>
Expand All @@ -4500,7 +4494,7 @@
</xsd:annotation>
</xsd:element>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:long" use="optional"/>
<xsd:attribute name="id" type="xsd:long"/>
</xsd:complexType>

<xsd:simpleType name="ShadowCheckType">
Expand Down
81 changes: 39 additions & 42 deletions model/model-intest/src/test/resources/manual/resource-dummy-itsm.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2017-2019 Evolveum and contributors
~ Copyright (C) 2017-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 All @@ -9,10 +9,8 @@
<resource oid="4d2131d8-5f75-11e8-8b1d-e73768ded4fc"
xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:conf="http://midpoint.evolveum.com/xml/ns/public/connector/builtin-1/bundle/com.evolveum.midpoint.model.intest.manual/DummyItsmIntegrationConnector"
xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"
xmlns:cap="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-3"
xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3">

<name>Dummy ITSM Resource</name>
Expand All @@ -36,47 +34,47 @@
<!-- Static schema definition -->
<schema>
<definition>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:ra="http://midpoint.evolveum.com/xml/ns/public/resource/annotation-3"
xmlns:tns="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"
xmlns:a="http://prism.evolveum.com/xml/ns/public/annotation-3"
elementFormDefault="qualified"
targetNamespace="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3">
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:ra="http://midpoint.evolveum.com/xml/ns/public/resource/annotation-3"
xmlns:tns="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"
xmlns:a="http://prism.evolveum.com/xml/ns/public/annotation-3"
elementFormDefault="qualified"
targetNamespace="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3">
<xsd:import namespace="http://prism.evolveum.com/xml/ns/public/annotation-3"/>
<xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/resource/annotation-3"/>
<xsd:complexType name="AccountObjectClass">
<xsd:annotation>
<xsd:appinfo>
<ra:resourceObject/>
<ra:identifier>tns:username</ra:identifier>
<ra:displayNameAttribute>tns:username</ra:displayNameAttribute>
<ra:namingAttribute>tns:username</ra:namingAttribute>
<ra:kind>account</ra:kind>
<ra:default/>
</xsd:appinfo>
</xsd:annotation>
<xsd:sequence>
<xsd:element minOccurs="1" name="username" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
<a:displayName>Username</a:displayName>
<a:displayOrder>110</a:displayOrder>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="fullname" type="xsd:string" minOccurs="0">
<xsd:annotation>
<xsd:appinfo>
<a:displayOrder>200</a:displayOrder>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element minOccurs="0" name="description" type="xsd:string"/>
<xsd:element maxOccurs="unbounded" minOccurs="0" name="interests" type="xsd:string"/>
</xsd:sequence>
<xsd:annotation>
<xsd:appinfo>
<ra:resourceObject/>
<ra:identifier>tns:username</ra:identifier>
<ra:displayNameAttribute>tns:username</ra:displayNameAttribute>
<ra:namingAttribute>tns:username</ra:namingAttribute>
<ra:kind>account</ra:kind>
<ra:default/>
</xsd:appinfo>
</xsd:annotation>
<xsd:sequence>
<xsd:element minOccurs="1" name="username" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
<a:displayName>Username</a:displayName>
<a:displayOrder>110</a:displayOrder>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="fullname" type="xsd:string" minOccurs="0">
<xsd:annotation>
<xsd:appinfo>
<a:displayOrder>200</a:displayOrder>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element minOccurs="0" name="description" type="xsd:string"/>
<xsd:element maxOccurs="unbounded" minOccurs="0" name="interests" type="xsd:string"/>
</xsd:sequence>
</xsd:complexType>
</xsd:schema>
</definition>
</xsd:schema>
</definition>
</schema>

<schemaHandling>
Expand Down Expand Up @@ -125,11 +123,10 @@
<pendingOperationGracePeriod>PT15M</pendingOperationGracePeriod>
<pendingOperationRetentionPeriod>PT30M</pendingOperationRetentionPeriod>
<deadShadowRetentionPeriod>PT2H</deadShadowRetentionPeriod>
<reshreshOnRead>true</reshreshOnRead>
<refreshOnRead>true</refreshOnRead>
<connectorErrorCriticality>
<network>partial</network>
<schema>partial</schema>
</connectorErrorCriticality>
</consistency>

</resource>
128 changes: 63 additions & 65 deletions model/model-intest/src/test/resources/manual/resource-manual-capabilities.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2017-2018 Evolveum and contributors
~ Copyright (C) 2017-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 @@ -32,50 +32,50 @@

<!-- Static schema definition -->
<schema>
<!-- No cahingMetadata here MID-4472, MID-4174 -->
<!-- No cachingMetadata here MID-4472, MID-4174 -->
<definition>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:ra="http://midpoint.evolveum.com/xml/ns/public/resource/annotation-3"
xmlns:tns="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"
xmlns:a="http://prism.evolveum.com/xml/ns/public/annotation-3"
elementFormDefault="qualified"
targetNamespace="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3">
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:ra="http://midpoint.evolveum.com/xml/ns/public/resource/annotation-3"
xmlns:tns="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"
xmlns:a="http://prism.evolveum.com/xml/ns/public/annotation-3"
elementFormDefault="qualified"
targetNamespace="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3">
<xsd:import namespace="http://prism.evolveum.com/xml/ns/public/annotation-3"/>
<xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/resource/annotation-3"/>
<xsd:complexType name="AccountObjectClass">
<xsd:annotation>
<xsd:appinfo>
<ra:resourceObject/>
<ra:identifier>tns:username</ra:identifier>
<ra:displayNameAttribute>tns:username</ra:displayNameAttribute>
<ra:namingAttribute>tns:username</ra:namingAttribute>
<ra:kind>account</ra:kind>
<ra:default/>
</xsd:appinfo>
</xsd:annotation>
<xsd:sequence>
<xsd:element minOccurs="1" name="username" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
<a:displayName>Username</a:displayName>
<a:displayOrder>110</a:displayOrder>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="fullname" type="xsd:string" minOccurs="0">
<xsd:annotation>
<xsd:appinfo>
<a:displayOrder>200</a:displayOrder>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element minOccurs="0" name="description" type="xsd:string"/>
<xsd:element minOccurs="0" name="status" type="xsd:string"/>
<xsd:element maxOccurs="unbounded" minOccurs="0" name="interests" type="xsd:string"/>
</xsd:sequence>
<xsd:annotation>
<xsd:appinfo>
<ra:resourceObject/>
<ra:identifier>tns:username</ra:identifier>
<ra:displayNameAttribute>tns:username</ra:displayNameAttribute>
<ra:namingAttribute>tns:username</ra:namingAttribute>
<ra:kind>account</ra:kind>
<ra:default/>
</xsd:appinfo>
</xsd:annotation>
<xsd:sequence>
<xsd:element minOccurs="1" name="username" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
<a:displayName>Username</a:displayName>
<a:displayOrder>110</a:displayOrder>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="fullname" type="xsd:string" minOccurs="0">
<xsd:annotation>
<xsd:appinfo>
<a:displayOrder>200</a:displayOrder>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element minOccurs="0" name="description" type="xsd:string"/>
<xsd:element minOccurs="0" name="status" type="xsd:string"/>
<xsd:element maxOccurs="unbounded" minOccurs="0" name="interests" type="xsd:string"/>
</xsd:sequence>
</xsd:complexType>
</xsd:schema>
</definition>
</xsd:schema>
</definition>
</schema>

<schemaHandling>
Expand Down Expand Up @@ -113,36 +113,35 @@
<outbound/>
</password>
</credentials>

</objectType>
</schemaHandling>


<capabilities>
<!-- No cahingMetadata here MID-4472, MID-4174 -->
<native xmlns:cap="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:type="c:CapabilityCollectionType">
<cap:read>
<cap:cachingOnly>true</cap:cachingOnly>
</cap:read>
<cap:create>
<cap:manual>true</cap:manual>
</cap:create>
<cap:update>
<cap:manual>true</cap:manual>
</cap:update>
<cap:addRemoveAttributeValues/>
<cap:delete>
<cap:manual>true</cap:manual>
</cap:delete>
<cap:activation>
<cap:status/>
</cap:activation>
<cap:credentials>
<cap:password/>
</cap:credentials>
</native>
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:type="c:CapabilityCollectionType">
<cap:read>
<cap:cachingOnly>true</cap:cachingOnly>
</cap:read>
<cap:create>
<cap:manual>true</cap:manual>
</cap:create>
<cap:update>
<cap:manual>true</cap:manual>
</cap:update>
<cap:addRemoveAttributeValues/>
<cap:delete>
<cap:manual>true</cap:manual>
</cap:delete>
<cap:activation>
<cap:status/>
</cap:activation>
<cap:credentials>
<cap:password/>
</cap:credentials>
</native>
<configured>
<cap:activation>
<cap:status>
Expand All @@ -159,7 +158,6 @@
<pendingOperationGracePeriod>PT15M</pendingOperationGracePeriod>
<pendingOperationRetentionPeriod>PT30M</pendingOperationRetentionPeriod>
<deadShadowRetentionPeriod>PT2H</deadShadowRetentionPeriod>
<reshreshOnRead>true</reshreshOnRead>
<refreshOnRead>true</refreshOnRead>
</consistency>

</resource>

0 comments on commit b43da8a

Please sign in to comment.