[midPoint-git] [Evolveum/prism] cf5af2: merge: merge annotation added
Viliam Repan
noreply at github.com
Wed Apr 17 14:46:44 CEST 2024
Branch: refs/heads/master
Home: https://github.com/Evolveum/prism
Commit: cf5af2ce510d20e09c6b480f55a13a591a72db2e
https://github.com/Evolveum/prism/commit/cf5af2ce510d20e09c6b480f55a13a591a72db2e
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-03-11 (Mon, 11 Mar 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Definition.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Merge.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/MutableDefinition.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismConstants.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/schema/annotation/Annotation.java
M infra/prism-impl/src/main/resources/xml/ns/public/annotation-3.xsd
Log Message:
-----------
merge: merge annotation added
Commit: 1f09c57e1399ec06cd94339b441ba9ed431ed366
https://github.com/Evolveum/prism/commit/1f09c57e1399ec06cd94339b441ba9ed431ed366
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-03-11 (Mon, 11 Mar 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/crypto/EncryptionException.java
M infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ExternalDataType.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/merge
Commit: 198b8ebe4967a2f11cb42a5c3c7254a3f307ffee
https://github.com/Evolveum/prism/commit/198b8ebe4967a2f11cb42a5c3c7254a3f307ffee
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-03-11 (Mon, 11 Mar 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/deleg/DefinitionDelegator.java
Log Message:
-----------
merge: compilation fix
Commit: b084f6a490a0df90395344cb29b9c2f92218b5c3
https://github.com/Evolveum/prism/commit/b084f6a490a0df90395344cb29b9c2f92218b5c3
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-03-12 (Tue, 12 Mar 2024)
Changed paths:
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/annotation/Annotation.java
Log Message:
-----------
merge: annotation handling typo fix
Commit: af668a72f230b3bcabb7df4793a16dca733006a6
https://github.com/Evolveum/prism/commit/af668a72f230b3bcabb7df4793a16dca733006a6
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-03-13 (Wed, 13 Mar 2024)
Changed paths:
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/merge
Commit: 0f42148b62b8b72f12d5d1cd515bd80efe386e67
https://github.com/Evolveum/prism/commit/0f42148b62b8b72f12d5d1cd515bd80efe386e67
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-03-14 (Thu, 14 Mar 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Definition.java
R infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Merge.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/MutableDefinition.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/deleg/DefinitionDelegator.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/schema/annotation/Annotation.java
M infra/prism-impl/src/main/resources/xml/ns/public/annotation-3.xsd
Log Message:
-----------
merge: merge annotation split into two -> merger, naturalKey. updated annotations in xsd. Implemented new natural key delegator
Commit: e3b6e3e9351eead32cd4d047f4a1662961e6cd4f
https://github.com/Evolveum/prism/commit/e3b6e3e9351eead32cd4d047f4a1662961e6cd4f
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-03-14 (Thu, 14 Mar 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerValueImpl.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/merge
Commit: 31f86286d0a4d1fa6e0473a9971d2708d50e9713
https://github.com/Evolveum/prism/commit/31f86286d0a4d1fa6e0473a9971d2708d50e9713
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-03-15 (Fri, 15 Mar 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/query/AxiomQueryLangService.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/AxiomQueryLangServiceImpl.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/query/lang/TestQueryCompletion.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/query/lang/TestQueryValidation.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/merge
Commit: 5b5f77770cb9ce69927219411346ed17f231bf6e
https://github.com/Evolveum/prism/commit/5b5f77770cb9ce69927219411346ed17f231bf6e
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-03-20 (Wed, 20 Mar 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/query/AxiomQueryLangService.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/query/PrismQuerySerialization.java
M infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/lex/dom/DomWriter.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/AxiomQueryValidationVisitor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/PrismQuerySerializerImpl.java
M infra/prism-impl/src/main/resources/xml/ns/test/foo-1.xsd
M infra/prism-impl/src/main/resources/xml/ns/test/foo-types-1.xsd
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/lex/TestDomParser.java
A infra/prism-impl/src/test/resources/common/xml/messageTemplate.xml
M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
M infra/util/src/test/java/com/evolveum/midpoint/util/DOMUtilTest.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/merge
Commit: 5b2964589384f3e5949473f43d457595e124c8ea
https://github.com/Evolveum/prism/commit/5b2964589384f3e5949473f43d457595e124c8ea
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-03-21 (Thu, 21 Mar 2024)
Changed paths:
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/DomToSchemaPostProcessor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/annotation/Annotation.java
Log Message:
-----------
merge: fixes in mergers and handling of naturalKey
Commit: a331aaeddd1045c6312f8a54f12513e95cf3bf1f
https://github.com/Evolveum/prism/commit/a331aaeddd1045c6312f8a54f12513e95cf3bf1f
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-03-25 (Mon, 25 Mar 2024)
Changed paths:
M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/merge
Commit: 3de50c739d0c470b141150c52f2e3f01699d2b66
https://github.com/Evolveum/prism/commit/3de50c739d0c470b141150c52f2e3f01699d2b66
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-04-16 (Tue, 16 Apr 2024)
Changed paths:
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/PrismQueryLanguageParserImpl.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/merge
Commit: a08701aed50171a48626db2e3043dd0e1b7eed57
https://github.com/Evolveum/prism/commit/a08701aed50171a48626db2e3043dd0e1b7eed57
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-04-16 (Tue, 16 Apr 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Definition.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/ItemMergerFactory.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/MergeStrategy.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/MutableDefinition.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/OriginMarker.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/deleg/DefinitionDelegator.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ItemMerger.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
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/key/NaturalKey.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/BaseItemMerger.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
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/GenericItemMerger.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemDefinitionImpl.java
A 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/PrismContainerValueImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContextImpl.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/DefaultNaturalKeyImpl.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/ItemPathNaturalKeyImpl.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/NaturalKeyImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/annotation/Annotation.java
Log Message:
-----------
natural key and mergers moved to prism
Commit: 637b323c53905b29b5d6abea0d75829242e7595d
https://github.com/Evolveum/prism/commit/637b323c53905b29b5d6abea0d75829242e7595d
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-04-16 (Tue, 16 Apr 2024)
Changed paths:
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/GenericItemMerger.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/ItemPathNaturalKeyImpl.java
Log Message:
-----------
lowered the need for existence of natural key for item path
Commit: 75d4869873acf0d6211a70b923a7a163f25a8e1a
https://github.com/Evolveum/prism/commit/75d4869873acf0d6211a70b923a7a163f25a8e1a
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-04-16 (Tue, 16 Apr 2024)
Changed paths:
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/ItemPathNaturalKeyImpl.java
Log Message:
-----------
lowered the need for existence of ngatural key for item path
Commit: 35ba9c43ec09c30d2df99376c6ea5d6e5d1256b2
https://github.com/Evolveum/prism/commit/35ba9c43ec09c30d2df99376c6ea5d6e5d1256b2
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-04-16 (Tue, 16 Apr 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/equivalence/EquivalenceStrategy.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/PrismContainerValueImpl.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
Log Message:
-----------
REAL_VALUE_CONSIDER_DIFFERENT_IDS_NATURAL_KEYS implemented
Commit: a3aa87be248f000676b32c9b265f3dd17565bc79
https://github.com/Evolveum/prism/commit/a3aa87be248f000676b32c9b265f3dd17565bc79
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-04-17 (Wed, 17 Apr 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/equivalence/EquivalenceStrategy.java
Log Message:
-----------
added simple diff test to try out new strategy, some javadoc
Commit: fadc3f8f655ba1d1d1f88a41a7d187c572951ae4
https://github.com/Evolveum/prism/commit/fadc3f8f655ba1d1d1f88a41a7d187c572951ae4
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-04-17 (Wed, 17 Apr 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Definition.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/deleg/DefinitionDelegator.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ItemMerger.java
R infra/prism-api/src/main/java/com/evolveum/midpoint/prism/key/NaturalKey.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/key/NaturalKeyDefinition.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/BaseItemMerger.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/GenericItemMerger.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/PrismContainerValueImpl.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/DefaultNaturalKeyDefinitionImpl.java
R infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/DefaultNaturalKeyImpl.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/ItemPathNaturalKeyDefinitionImpl.java
R infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/ItemPathNaturalKeyImpl.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/NaturalKeyDefinitionImpl.java
R infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/NaturalKeyImpl.java
Log Message:
-----------
renamed NaturalKey to NaturalKeyDefinition
Compare: https://github.com/Evolveum/prism/compare/a8e223f82509...fadc3f8f655b
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