Skip to content

Commit

Permalink
Rename "identity" -> "multiSource" config items
Browse files Browse the repository at this point in the history 
(Types are not renamed yet.)
  • Loading branch information
@mederly
mederly committed Sep 12, 2022
1 parent af7476b commit dfd7f16
Show file tree
Hide file tree
Showing 10 changed files with 48 additions and 47 deletions.
15 changes: 8 additions & 7 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 @@ -8394,12 +8394,13 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="identity" type="tns:IdentityDataHandlingType" minOccurs="0">
<xsd:element name="multiSource" type="tns:IdentityDataHandlingType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
Definition of handling of the identity data. TODO better explanation
Definition of handling of the data in "multi-source" mode.

TODO better name ... multiSource? multiProvenance?
TODO better explanation
TODO think of a better name
</xsd:documentation>
<xsd:appinfo>
<a:since>4.6</a:since>
Expand Down Expand Up @@ -8491,16 +8492,16 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="identity" type="tns:IdentityItemDefinitionType" minOccurs="0">
<xsd:element name="multiSource" type="tns:IdentityItemDefinitionType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
Marks the item as the one with multiple origins. Such items are not stored directly in their
Marks the item as the one with multiple sources. Such items are not stored directly in their
"main" place in the focus objects, but in $focus/identities/identity[x]/data object instead.
(Where identity[x] is the value assigned to the given origin.) Then there may be special
(Where identity[x] is the value assigned to the given source.) Then there may be special
mapping or mappings devoted to the selection of the value or values to be stored right
to the "main" place of the focus item.

TODO better name for this configuration item... multiSource? multiProvenance? multiOrigin? multi?
TODO better name for this configuration item
</xsd:documentation>
<xsd:appinfo>
<a:since>4.6</a:since>
Expand Down
6 changes: 3 additions & 3 deletions ...com/evolveum/midpoint/model/impl/lens/identities/IdentityManagementConfigurationImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ private static PathKeyedMap<IdentityItemConfiguration> extractItemsConfiguration
throws ConfigurationException {
PathKeyedMap<IdentityItemConfiguration> itemConfigurationMap = new PathKeyedMap<>();
for (ObjectTemplateItemDefinitionType itemDefBean : objectTemplate.getItem()) {
IdentityItemDefinitionType identityDefBean = itemDefBean.getIdentity();
if (identityDefBean != null) {
IdentityItemConfiguration configuration = IdentityItemConfigurationImpl.of(itemDefBean, identityDefBean);
IdentityItemDefinitionType multiSourceDefBean = itemDefBean.getMultiSource();
if (multiSourceDefBean != null) {
IdentityItemConfiguration configuration = IdentityItemConfigurationImpl.of(itemDefBean, multiSourceDefBean);
itemConfigurationMap.put(configuration.getPath(), configuration);
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...c/main/java/com/evolveum/midpoint/model/impl/lens/indexing/IndexingConfigurationImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ private static PathKeyedMap<IndexingItemConfiguration> extractItemsConfiguration
IndexingItemConfiguration itemConfiguration;
if (itemIndexingDefBean != null) {
itemConfiguration = IndexingItemConfigurationImpl.of(itemDefBean, itemIndexingDefBean);
} else if (itemDefBean.getIdentity() != null) {
// "Identity" items are indexed by default (TODO how can that be turned off?)
} else if (itemDefBean.getMultiSource() != null) {
// "Multi-source" items are indexed by default (TODO how can that be turned off?)
itemConfiguration = IndexingItemConfigurationImpl.of(itemDefBean, new ItemIndexingDefinitionType());
} else {
continue;
Expand Down
8 changes: 4 additions & 4 deletions ...ava/com/evolveum/midpoint/model/impl/lens/projector/focus/TemplateMappingsEvaluation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -345,15 +345,15 @@ private void collectLocalMappings(ObjectTemplateType objectTemplate) throws Conf
mappings.add(
new TemplateMappingEvaluationRequest(mapping, objectTemplate));
}
IdentityItemDefinitionType identityDefBean = templateItemDefBean.getIdentity();
if (identityDefBean != null) {
IdentityItemDefinitionType multiSourceDefBean = templateItemDefBean.getMultiSource();
if (multiSourceDefBean != null) {
mappings.add(
new TemplateMappingEvaluationRequest(
getOrCreateItemSelectionMapping(identityDefBean, ref),
getOrCreateItemSelectionMapping(multiSourceDefBean, ref),
objectTemplate));
}
}
IdentityDataHandlingType identityHandlingBean = objectTemplate.getIdentity();
IdentityDataHandlingType identityHandlingBean = objectTemplate.getMultiSource();
if (identityHandlingBean != null) {
ObjectTemplateMappingType mapping = getAuthoritativeSourceMapping(identityHandlingBean);
if (mapping != null) {
Expand Down
2 changes: 1 addition & 1 deletion model/model-impl/src/test/resources/correlator/correlation/user-template-complex.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<name>complex</name>
<item>
<ref>givenName</ref>
<identity/> <!-- to check that it is indexed by default -->
<multiSource/> <!-- to check that it is indexed by default -->
</item>
<item>
<ref>familyName</ref>
Expand Down
12 changes: 6 additions & 6 deletions model/model-intest/src/test/resources/identities/object-template-person.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</iterationSpecification>
<item>
<ref>givenName</ref>
<identity>
<multiSource>
<selection>
<expression>
<!-- Just for the demonstration of an item-specific selection algorithm -->
Expand Down Expand Up @@ -46,15 +46,15 @@
</script>
</expression>
</selection>
</identity>
</multiSource>
</item>
<item>
<ref>familyName</ref>
<identity/>
<multiSource/>
</item>
<item>
<ref>c:extension/ent:personalNumber</ref> <!-- here are namespaces to see if the default mapping is created correctly -->
<identity/>
<multiSource/>
</item>
<item>
<ref>name</ref>
Expand All @@ -71,7 +71,7 @@
</expression>
</mapping>
</item>
<identity>
<multiSource>
<defaultAuthoritativeSource>
<expression>
<script>
Expand Down Expand Up @@ -107,5 +107,5 @@
</script>
</expression>
</defaultAuthoritativeSource>
</identity>
</multiSource>
</objectTemplate>
12 changes: 6 additions & 6 deletions testing/story/src/test/resources/correlation/idmatch/medium/object-template-user.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@
</iterationSpecification>
<item>
<ref>givenName</ref>
<identity/>
<multiSource/>
</item>
<item>
<ref>familyName</ref>
<identity/>
<multiSource/>
</item>
<item>
<ref>extension/dateOfBirth</ref>
<identity/>
<multiSource/>
</item>
<item>
<ref>extension/nationalId</ref>
<identity/>
<multiSource/>
</item>
<mapping>
<strength>strong</strength>
Expand Down Expand Up @@ -62,7 +62,7 @@
<path>name</path>
</target>
</mapping>
<identity>
<multiSource>
<defaultAuthoritativeSource>
<expression>
<script>
Expand Down Expand Up @@ -92,5 +92,5 @@
</script>
</expression>
</defaultAuthoritativeSource>
</identity>
</multiSource>
</objectTemplate>
12 changes: 6 additions & 6 deletions .../story/src/test/resources/correlation/idmatch/multi-accounts/020-object-template-user.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@
</iterationSpecification>
<item>
<ref>givenName</ref>
<identity/>
<multiSource/>
</item>
<item>
<ref>familyName</ref>
<identity/>
<multiSource/>
</item>
<item>
<ref>extension/dateOfBirth</ref>
<identity/>
<multiSource/>
</item>
<item>
<ref>extension/nationalId</ref>
<identity/>
<multiSource/>
</item>
<mapping>
<strength>strong</strength>
Expand Down Expand Up @@ -62,7 +62,7 @@
<path>name</path>
</target>
</mapping>
<identity>
<multiSource>
<defaultAuthoritativeSource>
<expression>
<script>
Expand All @@ -89,6 +89,6 @@
</script>
</expression>
</defaultAuthoritativeSource>
</identity>
</multiSource>

</objectTemplate>
12 changes: 6 additions & 6 deletions testing/story/src/test/resources/correlation/internal/medium/object-template-user.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@
</iterationSpecification>
<item>
<ref>givenName</ref>
<identity/>
<multiSource/>
</item>
<item>
<ref>familyName</ref>
<identity/>
<multiSource/>
</item>
<item>
<ref>extension/dateOfBirth</ref>
<identity/>
<multiSource/>
</item>
<item>
<ref>extension/nationalId</ref>
<identity/>
<multiSource/>
</item>
<mapping>
<strength>strong</strength>
Expand Down Expand Up @@ -63,7 +63,7 @@
<path>name</path>
</target>
</mapping>
<identity>
<multiSource>
<defaultAuthoritativeSource>
<expression>
<script>
Expand Down Expand Up @@ -93,7 +93,7 @@
</script>
</expression>
</defaultAuthoritativeSource>
</identity>
</multiSource>
<correlation>
<correlators>
<items>
Expand Down
12 changes: 6 additions & 6 deletions ...ory/src/test/resources/correlation/internal/multi-accounts/020-object-template-person.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@
</iterationSpecification>
<item>
<ref>givenName</ref>
<identity/>
<multiSource/>
</item>
<item>
<ref>familyName</ref>
<identity/>
<multiSource/>
</item>
<item>
<ref>extension/dateOfBirth</ref>
<identity/>
<multiSource/>
</item>
<item>
<ref>extension/nationalId</ref>
<identity/>
<multiSource/>
</item>
<mapping>
<strength>strong</strength>
Expand Down Expand Up @@ -62,7 +62,7 @@
<path>name</path>
</target>
</mapping>
<identity>
<multiSource>
<defaultAuthoritativeSource>
<expression>
<script>
Expand All @@ -88,7 +88,7 @@
</script>
</expression>
</defaultAuthoritativeSource>
</identity>
</multiSource>
<correlation>
<correlators>
<items>
Expand Down

0 comments on commit dfd7f16

Please sign in to comment.