[midPoint-git] [Evolveum/prism] 1d4a83: Fix swallowing deltas

mederly noreply at github.com
Fri Jun 7 10:01:54 CEST 2024 

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/prism
  Commit: 1d4a839a0c4d546f88946efed7efe9ec88c1746f
      https://github.com/Evolveum/prism/commit/1d4a839a0c4d546f88946efed7efe9ec88c1746f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2024-05-29 (Wed, 29 May 2024)

  Changed paths:
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismValueCollectionsUtil.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/deleg/ItemDeltaDelegator.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ItemDeltaImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ObjectDeltaImpl.java

  Log Message:
  -----------
  Fix swallowing deltas

1. We now partially support overlapping deltas: e.g. if adding a new
assignment, and modifying it afterward, the new delta will get merged
with the assignment-adding one.

2. When swallowing "add PCV" deltas into object ADD delta, we now
take care to NOT merge two equivalent PCVs with different IDs into
one.

Necessary for the new associations.


  Commit: 578d8bda931923e9152d49568f6197a86c4f2e63
      https://github.com/Evolveum/prism/commit/578d8bda931923e9152d49568f6197a86c4f2e63
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2024-06-05 (Wed, 05 Jun 2024)

  Changed paths:
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/PlusMinusZero.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/extensions/AbstractDelegatedPrismValueDeltaSetTriple.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/DeltaSetTripleImpl.java

  Log Message:
  -----------
  Add mode-aware foreach for delta set triples

Needed for associations.


  Commit: 50d99fd4a52b01bab5ba8c671fb7f9fdba22b058
      https://github.com/Evolveum/prism/commit/50d99fd4a52b01bab5ba8c671fb7f9fdba22b058
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2024-06-07 (Fri, 07 Jun 2024)

  Changed paths:
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Definition.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/ParsingContext.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismNamespaceContext.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismParser.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/query/PrismQuerySerializer.java
    A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/schemaContext/SchemaContext.java
    A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/schemaContext/SchemaContextDefinition.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/xml/XsdTypeMapper.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/DefinitionImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/DummyPrismObjectDefinition.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemMergerFactoryImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ParsingContextImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerDefinitionImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismObjectImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismReferenceDefinitionImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismReferenceValueImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismValueImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/ItemPathHolder.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/ItemPathSerialization.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismParserImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismUnmarshaller.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/AxiomQueryCompletionVisitor.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/AxiomQueryLangServiceImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/PrismQuerySerializerImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/QueryWriter.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaDomSerializer.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaRegistryImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaRegistryStateImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaXsomParser.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/annotation/Annotation.java
    A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/annotation/SchemaContextProcessor.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/features/DefinitionFeatures.java
    A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schemaContext/ContextResolverFactory.java
    A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schemaContext/SchemaContextDefinitionImpl.java
    A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schemaContext/SchemaContextImpl.java
    A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schemaContext/resolver/ResourceObjectContextResolver.java
    A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schemaContext/resolver/SchemaContextResolver.java
    A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schemaContext/resolver/SchemaContextResolverRegistry.java
    A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schemaContext/resolver/TypeContextResolver.java
    A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schemaContext/resolver/TypePropertyContextResolver.java
    M infra/prism-impl/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/prism-impl/src/main/resources/xml/ns/test/foo-1.xsd
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
    A infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestSchemaContext.java
    A infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/AbstractRoleType.java
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/AccountType.java
    A infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/ArchetypePolicyType.java
    A infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/ArchetypeTypeType.java
    A infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/AssignmentHolderType.java
    A infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/AuthorizationType.java
    A infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/ConnectorType.java
    A infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/FocusType.java
    A infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/GuiObjectListPanelConfigurationType.java
    A infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/GuiObjectListViewType.java
    A infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/GuiShadowListViewType.java
    A infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/LinkedObjectSelectorType.java
    A infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/ObjectParentSelectorType.java
    A infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/ObjectPolicyConfigurationType.java
    A infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/ObjectSelectorType.java
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/ObjectType.java
    A infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/OwnedObjectSelectorType.java
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/ResourceType.java
    A infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/RoleType.java
    A infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/SubjectedObjectSelectorType.java
    A infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/UserInterfaceFeatureType.java
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/UserType.java
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/query/lang/TestQueryCompletion.java
    A infra/prism-impl/src/test/resources/common/xml/role-proxy.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/origin/master' into tmp/associations-first-steps


Compare: https://github.com/Evolveum/prism/compare/c168ca443bb0...50d99fd4a52b

To unsubscribe from these emails, change your notification settings at https://github.com/Evolveum/prism/settings/notifications

More information about the midPoint-svn mailing list