[midPoint-git] [Evolveum/midpoint] 425701: fix schrodinger test for lab 101
Tony Tkáčik
noreply at github.com
Mon Jul 13 17:58:16 CEST 2020
Branch: refs/heads/feature/axiom
Home: https://github.com/Evolveum/midpoint
Commit: 425701d65847399412f7d7518ac0f9f97ebe41c4
https://github.com/Evolveum/midpoint/commit/425701d65847399412f7d7518ac0f9f97ebe41c4
Author: lskublik <lskublik at evolveum.com>
Date: 2020-07-08 (Wed, 08 Jul 2020)
Changed paths:
M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M8ExtendingMidPointXMLSchema.java
Log Message:
-----------
fix schrodinger test for lab 101
Commit: 6d51987c33e9ae60be0da935d3b32ee33363ca99
https://github.com/Evolveum/midpoint/commit/6d51987c33e9ae60be0da935d3b32ee33363ca99
Author: lskublik <lskublik at evolveum.com>
Date: 2020-07-08 (Wed, 08 Jul 2020)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/AbstractSearchConfigurationPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPropertiesConfigPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SwitchablePropertyValuePanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SwitchablePropertyValuePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/filter/BasicSearchFilter.java
M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ItemDeltaImpl.java
M infra/schema/src/main/resources/xml/ns/public/common/common-metadata-3.xsd
M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/ModelCommonBeans.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/AbstractMappingBuilder.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/AbstractMappingImpl.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingEvaluationEnvironment.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingFactory.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingImpl.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingParser.java
R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingValueMetadataComputerImpl.java
R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MetadataMappingBuilder.java
R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MetadataMappingEvaluator.java
R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MetadataMappingImpl.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/PrismValueDeltaSetTripleProducer.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/TimeConstraintsEvaluation.java
R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/ValueMetadataComputation.java
R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/ValueMetadataProcessingSpec.java
R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/builtin/BaseBuiltinMetadataMapping.java
R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/builtin/BuiltinMetadataMapping.java
R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/builtin/BuiltinMetadataMappingsRegistry.java
R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/builtin/CreateTimestampBuiltinMapping.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/MetadataMappingBuilder.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/MetadataMappingEvaluator.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/MetadataMappingImpl.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/ValueMetadataComputation.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/ValueMetadataProcessingSpec.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/BaseBuiltinMetadataMapping.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/BuiltinMetadataMapping.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/BuiltinMetadataMappingsRegistry.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/CreateTimestampBuiltinMapping.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/MappingTestEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelBeans.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ItemValueWithOrigin.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidatorBuilder.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ObjectDeltaWaves.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/AssignmentEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/EvaluatedOutboundConstructionImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConsolidationProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/MappingSetEvaluation.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/MappingSetEvaluationBuilder.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/MappingSorter.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/TemplateMappingsEvaluation.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/consolidation/DeltaSetTripleConsolidation.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/consolidation/DeltaSetTripleMapConsolidation.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/FixedTargetSpecification.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingEvaluator.java
R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingSetEvaluator.java
R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/SelfTargetSpecification.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/TargetObjectSpecification.java
M model/model-impl/src/main/resources/ctx-model.xml
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestValueMetadata.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
M model/model-intest/src/test/resources/common/user-template-complex.xml
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ValueMetadataComputer.java
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/origin/master'
Commit: e749491f9dd8ae449f73e198b1d29db4cf41fd06
https://github.com/Evolveum/midpoint/commit/e749491f9dd8ae449f73e198b1d29db4cf41fd06
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-07-08 (Wed, 08 Jul 2020)
Changed paths:
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/spec/expressions/TestExpressionSpec.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdate.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestConsistencyMechanism.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLargeGroups.java
Log Message:
-----------
Adapt TestConsistencyMechanism.test511
After changing (fixing?) consolidation algorithm this test
started to fail. I think that the test is not correct so
I adapted it. However, this is to be discussed.
Related to MID-6275.
Commit: ab1d4313e107efce90822883d07d849ffdc98f67
https://github.com/Evolveum/midpoint/commit/ab1d4313e107efce90822883d07d849ffdc98f67
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-07-08 (Wed, 08 Jul 2020)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/AbstractSearchConfigurationPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPropertiesConfigPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SwitchablePropertyValuePanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SwitchablePropertyValuePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/filter/BasicSearchFilter.java
M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M8ExtendingMidPointXMLSchema.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Commit: 36ae15da4bfe935dfc0bb1b2dd1bf8e5ec3e900a
https://github.com/Evolveum/midpoint/commit/36ae15da4bfe935dfc0bb1b2dd1bf8e5ec3e900a
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-07-09 (Thu, 09 Jul 2020)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Item.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/PrismValue.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/ValueMetadata.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/PropertyDelta.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/equivalence/ParameterizedEquivalenceStrategy.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerImpl.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/PrismPropertyImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismPropertyValueImpl.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/delta/ItemDeltaImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ObjectDeltaImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/PropertyDeltaImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/item/DummyItem.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/metadata/ValueMetadataAdapter.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestDelta.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/metadata/MidpointValueMetadataFactory.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/transformation/ValueTupleTransformation.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/AbstractMappingImpl.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingImpl.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/ValueMetadataComputation.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/ValueMetadataProcessingSpec.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/BaseBuiltinMetadataMapping.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/ProvenanceBuiltinMapping.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/consolidation/DeltaSetTripleMapConsolidation.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestValueMetadata.java
A model/model-intest/src/test/resources/metadata/provenance-metadata-recording/archetype-provenance-metadata-recording.xml
A model/model-intest/src/test/resources/metadata/provenance-metadata-recording/origin-admin-entry.xml
A model/model-intest/src/test/resources/metadata/provenance-metadata-recording/origin-hr-feed.xml
A model/model-intest/src/test/resources/metadata/provenance-metadata-recording/origin-self-service-app.xml
A model/model-intest/src/test/resources/metadata/provenance-metadata-recording/resource-hr.xml
A model/model-intest/src/test/resources/metadata/provenance-metadata-recording/template-provenance-metadata-recording.xml
A model/model-intest/src/test/resources/metadata/provenance-metadata-recording/user-leonhard.xml
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/TestResource.java
Log Message:
-----------
Add support for provenance metadata
1) Built-in mapping for provenance (acquisition and yield) was
created. However, it is only a preliminary version. It cannot delete
values. This will require deeper changes in the framework.
2) Added support for metadata change on values KEPT during
consolidation. It is implemented as ADD & DELETE of the same value,
with different metadata. (Requires a lot of code changes.)
3) Prism equivalence/narrow methods were cleaned up a bit. This is
to enable correct diff'ing of values with metadata. This change has
a potential to break many things in midPoint.
4) Delta narrow method checks for ADD & DELETE of the same value.
Mainly to enable point 2 above.
5) Changed handling of deltas in the repository (to enable point 2).
This has broken various things and should be revisited.
6) Added consideringValueMetadata option in
ParameterizedEquivalenceStrategy.
7) Displaying basic value metadata in various debugDump/shortDump/etc
methods.
Related to MID-6275.
Commit: 37e47dc797fece601603fd04aa202592e30ce9df
https://github.com/Evolveum/midpoint/commit/37e47dc797fece601603fd04aa202592e30ce9df
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-07-09 (Thu, 09 Jul 2020)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Item.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/PrismPropertyValue.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ItemDeltaCollectionsUtil.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/PropertyDelta.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/equivalence/EquivalenceStrategy.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/equivalence/ParameterizedEquivalenceStrategy.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerImpl.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/PrismPropertyValueImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismReferenceImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ContainerDeltaImpl.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
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/PropertyDeltaImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/item/DummyContainerImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/item/DummyItem.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/item/DummyPropertyImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/item/DummyReferenceImpl.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestCompare.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestDelta.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestEquals.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Visualizer.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.java
Log Message:
-----------
Improve item delta processing
In order to correctly record value metadata the delta processing
(and item modifications in general) were changed in this way:
1) Value is now added unless exactly the same (under "not literal"
strategy) value is present in the item. All equivalent values
(under configurable strategy) are removed before the addition.
This change is reflected also in delta application.
2) Delta narrowing functionality was clarified and (hopefully)
corrected to match these changes.
3) Various rarely used methods were removed from Item interface. They
were probably causing more harm than benefit, because of their unclear
semantics. Other minor clarifications of that interface.
4) Wrong initialization of ParameterizedEquivalenceStrategy
constants was fixed.
5) We removed some flexibility in equivalence strategy selection:
it's no longer possible to specify default strategy for items; nor
to execute deltas under custom strategies). Delta application
was switched from IGNORE_METADATA_CONSIDER_DIFFERENT_IDS to
REAL_VALUE_CONSIDER_DIFFERENT_IDS which is a bit weaker.
Related to MID-6275.
Commit: b5937212fc40e69c96adb46b39572bca2905ef06
https://github.com/Evolveum/midpoint/commit/b5937212fc40e69c96adb46b39572bca2905ef06
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-07-10 (Fri, 10 Jul 2020)
Changed paths:
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
A repo/repo-sql-impl-test/src/test/resources/modify/user-adam-new-assignment-existing-id.xml
A repo/repo-sql-impl-test/src/test/resources/modify/user-adam-new-assignment-no-id.xml
A repo/repo-sql-impl-test/src/test/resources/modify/user-adam.xml
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/AssignmentExtensionUpdate.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/BaseUpdate.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/ExtensionUpdate.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/GeneralUpdate.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/MetadataUpdate.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/ObjectDeltaUpdater.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/ObjectExtensionUpdate.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/OperationResultUpdate.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/PhotoUpdate.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/TypeValuePair.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/UpdateContext.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/UpdateDispatcher.java
Log Message:
-----------
Refactor ObjectDeltaUpdater before adapting it
Because of the change in ADD/REPLACE delta execution
we have to adapt the ObjectDeltaUpdater. This is a refactoring
(basically dividing it into a set of cooperating classes)
before the adaptation.
Related to MID-6275.
Commit: e5dd3d4c58e78d2a43563c7da4e090286325d8bf
https://github.com/Evolveum/midpoint/commit/e5dd3d4c58e78d2a43563c7da4e090286325d8bf
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-07-10 (Fri, 10 Jul 2020)
Changed paths:
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/GeneralUpdate.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/TypeValuePair.java
Log Message:
-----------
Clean-up GeneralUpdate class before adapting it
This is a final cleanup step before adapting repo processing to
the change in ADD/REPLACE delta execution.
Related to MID-6275.
Commit: a8e8880fdd142248d11e58eb81e4100ad85bcd3b
https://github.com/Evolveum/midpoint/commit/a8e8880fdd142248d11e58eb81e4100ad85bcd3b
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-07-10 (Fri, 10 Jul 2020)
Changed paths:
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
R repo/repo-sql-impl-test/src/test/resources/modify/user-adam-new-assignment-existing-id.xml
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/GeneralUpdate.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/ObjectDeltaUpdater.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/modify/DeltaUpdaterUtils.java
Log Message:
-----------
Improve GeneralUpdate a bit
Minor changes in GeneralUpdate class e.g. swapping application
of add and delete values (now delete values come first, just like
in regular delta application). This is what has left from unsuccessful
attempt to make updater process container value metadata.
Related to MID-6275.
Commit: 4a08872b170ed20f2dbadd697208248d0f74f1c5
https://github.com/Evolveum/midpoint/commit/4a08872b170ed20f2dbadd697208248d0f74f1c5
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-07-10 (Fri, 10 Jul 2020)
Changed paths:
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
A repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/StrangeModifyTest.java
A repo/repo-sql-impl-test/src/test/resources/modify/user-bob.xml
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/CollectionUpdate.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/GeneralUpdate.java
Log Message:
-----------
Implement replacing container values in repo
We can now replace containers in repo (for the time being
if using client-specified ID). The session.merge call was the key.
This commit also:
- fixes equals/hashCode for RAssignment in cases when ownerOid is null
- factors out collection-updating functionality to CollectionUpdate
class.
Related to MID-6275.
Commit: cc97743cfe9cabeffe74dff63b64ed5e9d525600
https://github.com/Evolveum/midpoint/commit/cc97743cfe9cabeffe74dff63b64ed5e9d525600
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-07-11 (Sat, 11 Jul 2020)
Changed paths:
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/ROperationExecution.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/CollectionUpdate.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/ContainerCollectionUpdate.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/GeneralUpdate.java
Log Message:
-----------
Simplify [Container]CollectionUpdate
The code should be quite minimalistic now. It relies on repository
vs. XML consistency and tries to fail fast on any issues. Highly
experimental - we will see how it will behave in production.
Related to MID-6275.
Commit: a68b58859e69cfd7e07dcee5091054aefb43a1ed
https://github.com/Evolveum/midpoint/commit/a68b58859e69cfd7e07dcee5091054aefb43a1ed
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-07-11 (Sat, 11 Jul 2020)
Changed paths:
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
M repo/repo-sql-impl-test/src/test/resources/modify/user-adam.xml
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAccessCertificationCase.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RCaseWorkItem.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/ROperationExecution.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RTrigger.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RLookupTableRow.java
Log Message:
-----------
Fix getting/setting ownerOid on containers in repo
Also adapted tests that check for audit and notification
outputs for redundant primary ADD deltas. See MID-6370.
Related to MID-6275.
Commit: 3c5403e34c8bb08fc65560e9e188f1add961065c
https://github.com/Evolveum/midpoint/commit/3c5403e34c8bb08fc65560e9e188f1add961065c
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-07-11 (Sat, 11 Jul 2020)
Changed paths:
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/other/TestMiscellaneous.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
Log Message:
-----------
Adapt a workflow test to recent repo changes
Actually, the current behavior is more correct than before.
The test was wrong.
Related to MID-6275.
Commit: 7eff1b1986e2164c3dea5a771d4eb29167a6730f
https://github.com/Evolveum/midpoint/commit/7eff1b1986e2164c3dea5a771d4eb29167a6730f
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-07-11 (Sat, 11 Jul 2020)
Changed paths:
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/metadata/ValueMetadataAdapter.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/ValueMetadataProcessingSpec.java
Log Message:
-----------
Fix metadata shortDump output
Commit: 818e69267a52dd8edeb9182f83ce5b0682642445
https://github.com/Evolveum/midpoint/commit/818e69267a52dd8edeb9182f83ce5b0682642445
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-07-11 (Sat, 11 Jul 2020)
Changed paths:
M gui/admin-gui/src/test/java/com/evolveum/midpoint/gui/TestIntegrationObjectWrapperFactory.java
M gui/admin-gui/src/test/java/com/evolveum/midpoint/gui/TestWrapperDelta.java
Log Message:
-----------
Temporarily disable 3 failing GUI tests
Commit: d0ec72af261c3ab77f11ddbcfb76daa06971853f
https://github.com/Evolveum/midpoint/commit/d0ec72af261c3ab77f11ddbcfb76daa06971853f
Author: Tony Tkacik <tony.tkacik at evolveum.com>
Date: 2020-07-13 (Mon, 13 Jul 2020)
Changed paths:
M gui/admin-gui/src/test/java/com/evolveum/midpoint/gui/TestIntegrationObjectWrapperFactory.java
M gui/admin-gui/src/test/java/com/evolveum/midpoint/gui/TestWrapperDelta.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/PrismObject.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.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/ValueMetadata.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ItemDeltaCollectionsUtil.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/PropertyDelta.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/equivalence/EquivalenceStrategy.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/equivalence/ParameterizedEquivalenceStrategy.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerImpl.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/PrismPropertyImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismPropertyValueImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismReferenceImpl.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/delta/ContainerDeltaImpl.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
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/PropertyDeltaImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/item/DummyContainerImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/item/DummyItem.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/item/DummyPropertyImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/item/DummyReferenceImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/metadata/ValueMetadataAdapter.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestCompare.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestDelta.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestEquals.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/metadata/MidpointValueMetadataFactory.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/transformation/ValueTupleTransformation.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/AbstractMappingImpl.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingImpl.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/ValueMetadataComputation.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/ValueMetadataProcessingSpec.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/BaseBuiltinMetadataMapping.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/ProvenanceBuiltinMapping.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/consolidation/DeltaSetTripleMapConsolidation.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Visualizer.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/spec/expressions/TestExpressionSpec.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestValueMetadata.java
A model/model-intest/src/test/resources/metadata/provenance-metadata-recording/archetype-provenance-metadata-recording.xml
A model/model-intest/src/test/resources/metadata/provenance-metadata-recording/origin-admin-entry.xml
A model/model-intest/src/test/resources/metadata/provenance-metadata-recording/origin-hr-feed.xml
A model/model-intest/src/test/resources/metadata/provenance-metadata-recording/origin-self-service-app.xml
A model/model-intest/src/test/resources/metadata/provenance-metadata-recording/resource-hr.xml
A model/model-intest/src/test/resources/metadata/provenance-metadata-recording/template-provenance-metadata-recording.xml
A model/model-intest/src/test/resources/metadata/provenance-metadata-recording/user-leonhard.xml
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/other/TestMiscellaneous.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdate.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
A repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/StrangeModifyTest.java
A repo/repo-sql-impl-test/src/test/resources/modify/user-adam-new-assignment-no-id.xml
A repo/repo-sql-impl-test/src/test/resources/modify/user-adam.xml
A repo/repo-sql-impl-test/src/test/resources/modify/user-bob.xml
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAccessCertificationCase.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RCaseWorkItem.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/ROperationExecution.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RTrigger.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RLookupTableRow.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/AssignmentExtensionUpdate.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/BaseUpdate.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/CollectionUpdate.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/ContainerCollectionUpdate.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/ExtensionUpdate.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/GeneralUpdate.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/MetadataUpdate.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/ObjectDeltaUpdater.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/ObjectExtensionUpdate.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/OperationResultUpdate.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/PhotoUpdate.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/UpdateContext.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/UpdateDispatcher.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/modify/DeltaUpdaterUtils.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/TestResource.java
M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M8ExtendingMidPointXMLSchema.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestConsistencyMechanism.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLargeGroups.java
Log Message:
-----------
Merge remote-tracking branch 'origin/tmp/provenance' into feature/axiom
Commit: 419f85587c40f317b4306fe27e32c87e645adecf
https://github.com/Evolveum/midpoint/commit/419f85587c40f317b4306fe27e32c87e645adecf
Author: Tony Tkacik <tony.tkacik at evolveum.com>
Date: 2020-07-13 (Mon, 13 Jul 2020)
Changed paths:
M infra/axiom/src/main/java/com/evolveum/axiom/lang/spi/AxiomItemDefinitionImpl.java
M infra/prism-api/src/main/resources/prism-model.axiom
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/axiom/AxiomEnabledSchemaRegistry.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
M infra/schema/src/main/resources/xml/ns/public/common/common-metadata-3.axiom
Log Message:
-----------
Prism: Added mapping of complex types and object references to PrismSchema
Signed-off-by: Tony Tkacik <tony.tkacik at evolveum.com>
Compare: https://github.com/Evolveum/midpoint/compare/815e54df7ed5...419f85587c40
More information about the midPoint-svn
mailing list