[midPoint-git] [Evolveum/prism] 4611d1: MID-9278 prism annotations handling, wip
Viliam Repan
noreply at github.com
Thu Nov 30 19:22:12 CET 2023
Branch: refs/heads/master
Home: https://github.com/Evolveum/prism
Commit: 4611d1523e7f7650c36375e4ce8b386928b6fb2a
https://github.com/Evolveum/prism/commit/4611d1523e7f7650c36375e4ce8b386928b6fb2a
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2023-10-29 (Sun, 29 Oct 2023)
Changed paths:
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/DefinitionImpl.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/Annotation.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/AnnotationConverter.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/DomToSchemaPostProcessor.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/EnumAnnotationConverter.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/ItemProcessingConverter.java
Log Message:
-----------
MID-9278 prism annotations handling, wip
Commit: 25ec9a33948b4d4c9f2e59122eb6c03121ac9395
https://github.com/Evolveum/prism/commit/25ec9a33948b4d4c9f2e59122eb6c03121ac9395
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2023-11-02 (Thu, 02 Nov 2023)
Changed paths:
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ComplexTypeDefinitionImpl.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/ItemDefinitionImpl.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/schema/Annotation.java
R infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/AnnotationConverter.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/AnnotationProcessor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/DomToSchemaPostProcessor.java
R infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/EnumAnnotationConverter.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/EnumAnnotationProcessor.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/IgnoreProcessor.java
R infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/ItemProcessingConverter.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/ItemProcessingProcessor.java
Log Message:
-----------
MID-9278 improved annotation converter - changed to fully featured processor, added documentation
Commit: 388306d37fc0486f8a6b5239c6faf7eba4775b15
https://github.com/Evolveum/prism/commit/388306d37fc0486f8a6b5239c6faf7eba4775b15
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2023-11-03 (Fri, 03 Nov 2023)
Changed paths:
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/Annotation.java
Log Message:
-----------
MID-9278 fixed failing test - planned removal annotation type issue
Commit: 5a1602673da868e8132c9afae48bb365553a0e9b
https://github.com/Evolveum/prism/commit/5a1602673da868e8132c9afae48bb365553a0e9b
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2023-11-03 (Fri, 03 Nov 2023)
Changed paths:
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/Annotation.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/DomToSchemaPostProcessor.java
Log Message:
-----------
MID-9278 more code removed from dom to schema post processor
Commit: b99ea91001e9aea6d44a69af68a317b041cab8ec
https://github.com/Evolveum/prism/commit/b99ea91001e9aea6d44a69af68a317b041cab8ec
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2023-11-03 (Fri, 03 Nov 2023)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismValueCollectionsUtil.java
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/DomToSchemaProcessor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/PrismSchemaImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaDefinitionFactory.java
M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/mid-9278-annotations-review
Commit: 6d4ed1813fed8fb6dacd7c543127e5bee2af3fb8
https://github.com/Evolveum/prism/commit/6d4ed1813fed8fb6dacd7c543127e5bee2af3fb8
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2023-11-06 (Mon, 06 Nov 2023)
Changed paths:
M infra/axiom/src/test/resources/prism/old/common-core.axiom
M infra/axiom/src/test/resources/prism/old/common-core.prism
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Display.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/schema/Annotation.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
Log Message:
-----------
MID-9278 emphasized=true replaced with display=emphasized/hidden annotation
Commit: 9c9514f4c8a31a46361d10baf58c5db9d430b050
https://github.com/Evolveum/prism/commit/9c9514f4c8a31a46361d10baf58c5db9d430b050
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2023-11-08 (Wed, 08 Nov 2023)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Display.java
M infra/prism-impl/src/main/resources/xml/ns/public/annotation-3.xsd
Log Message:
-----------
MID-9278 prism display annotation added new values collapsed/expanded
Commit: 77a8fc3e687a830f5d2089d4ade3ef9bfdbdd115
https://github.com/Evolveum/prism/commit/77a8fc3e687a830f5d2089d4ade3ef9bfdbdd115
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2023-11-13 (Mon, 13 Nov 2023)
Changed paths:
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ComplexTypeDefinitionImpl.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/ItemDefinitionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismReferenceDefinitionImpl.java
Log Message:
-----------
MID-9278 reverted annotations being read just from map (they are still being added to map)
Commit: d91889e29fc36115ff70fa8791abbc69d3cc4909
https://github.com/Evolveum/prism/commit/d91889e29fc36115ff70fa8791abbc69d3cc4909
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2023-11-13 (Mon, 13 Nov 2023)
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/Display.java
A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/DisplayHint.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/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.java
M infra/prism-impl/src/main/resources/xml/ns/public/annotation-3.xsd
Log Message:
-----------
MID-9278 display (deprecating embedded=true/false) annotation integrated
Commit: 4b9d374fb58369efdafbbb70818c66772cd1f493
https://github.com/Evolveum/prism/commit/4b9d374fb58369efdafbbb70818c66772cd1f493
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2023-11-14 (Tue, 14 Nov 2023)
Changed paths:
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/ItemDefinitionImpl.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/schema/Annotation.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/AnnotationProcessor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/EnumAnnotationProcessor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/IgnoreProcessor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/ItemProcessingProcessor.java
Log Message:
-----------
MID-9278 improving annotations handling, now through setters also adding item to annotation map
Commit: a3abb28e0df4465ee38a0d968e6924b3ddada751
https://github.com/Evolveum/prism/commit/a3abb28e0df4465ee38a0d968e6924b3ddada751
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2023-11-14 (Tue, 14 Nov 2023)
Changed paths:
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/ItemDefinitionImpl.java
Log Message:
-----------
MID-9278 improving annotations handling, now through setters also adding item to annotation map
Commit: 79164171b4a07d77c1d466c2285e406eaf05e4b8
https://github.com/Evolveum/prism/commit/79164171b4a07d77c1d466c2285e406eaf05e4b8
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2023-11-14 (Tue, 14 Nov 2023)
Changed paths:
M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/mid-9278-annotations-review
Commit: a39d24e9b7ffdfce30515da7a8a82fffe43a42fb
https://github.com/Evolveum/prism/commit/a39d24e9b7ffdfce30515da7a8a82fffe43a42fb
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2023-11-14 (Tue, 14 Nov 2023)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/MutableItemDefinition.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/ItemDefinitionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerValueImpl.java
R infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/Annotation.java
R infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/AnnotationProcessor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/DomToSchemaPostProcessor.java
R infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/EnumAnnotationProcessor.java
R infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/IgnoreProcessor.java
R infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/ItemProcessingProcessor.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/annotation/AlwaysUseForEqualsProcessor.java
A 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/AnnotationProcessor.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/annotation/EnumAnnotationProcessor.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/annotation/IgnoreProcessor.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/annotation/ItemProcessingProcessor.java
Log Message:
-----------
MID-9278 always use equals annotation now support marking "self" not only container items
Commit: e3d8772b2ec61e92a2628b33893bcd0380f3d2bf
https://github.com/Evolveum/prism/commit/e3d8772b2ec61e92a2628b33893bcd0380f3d2bf
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2023-11-14 (Tue, 14 Nov 2023)
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/AlwaysUseForEqualsProcessor.java
Log Message:
-----------
MID-9278 always use equals annotation now support marking "self" not only container items => test + bugfixes
Commit: d80cd75f96736101ec7f486a2c5e6a209ef31bfb
https://github.com/Evolveum/prism/commit/d80cd75f96736101ec7f486a2c5e6a209ef31bfb
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2023-11-15 (Wed, 15 Nov 2023)
Changed paths:
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerValueImpl.java
Log Message:
-----------
MID-9278 always use equals, more bugfixing
Commit: 32cc076a798f523b3c42d807c965b7eb71061d08
https://github.com/Evolveum/prism/commit/32cc076a798f523b3c42d807c965b7eb71061d08
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2023-11-15 (Wed, 15 Nov 2023)
Changed paths:
M infra/axiom/src/main/antlr4/com/evolveum/axiom/lang/antlr/query/AxiomQueryParser.g4
A infra/axiom/src/main/java/com/evolveum/axiom/lang/antlr/AxiomQueryError.java
A infra/axiom/src/main/java/com/evolveum/axiom/lang/antlr/AxiomQueryErrorListener.java
M infra/axiom/src/main/java/com/evolveum/axiom/lang/antlr/AxiomQuerySource.java
A 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/marshaller/ItemPathHolder.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/AxiomQueryCompletionVisitor.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/AxiomQueryLangServiceImpl.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/AxiomQueryValidationVisitor.java
A infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/FilterNamesProvider.java
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/mid-9278-annotations-review
Commit: 733f646f918e5016b51a7c4ac6d350bc1bc6809c
https://github.com/Evolveum/prism/commit/733f646f918e5016b51a7c4ac6d350bc1bc6809c
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2023-11-15 (Wed, 15 Nov 2023)
Changed paths:
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/annotation/Annotation.java
Log Message:
-----------
MID-9278 always use equals, fixed all tests
Commit: a9cfb4a544009b986f7946cc5f9379edb1190d68
https://github.com/Evolveum/prism/commit/a9cfb4a544009b986f7946cc5f9379edb1190d68
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2023-11-28 (Tue, 28 Nov 2023)
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/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:
-----------
MID-9278 optionalCleanup annotation support added (also resource/schema/definition marked as first item)
Commit: 8834f8e80e8a25174614f4cb3e7d3b072d6b38c3
https://github.com/Evolveum/prism/commit/8834f8e80e8a25174614f4cb3e7d3b072d6b38c3
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2023-11-29 (Wed, 29 Nov 2023)
Changed paths:
M infra/axiom/src/main/antlr4/com/evolveum/axiom/lang/antlr/query/AxiomQueryParser.g4
M infra/axiom/src/main/java/com/evolveum/axiom/lang/antlr/AxiomQueryError.java
M infra/axiom/src/main/java/com/evolveum/axiom/lang/antlr/AxiomQueryErrorListener.java
M infra/axiom/src/main/java/com/evolveum/axiom/lang/antlr/AxiomQuerySource.java
M infra/prism-api/pom.xml
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/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/FilterNamesProvider.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/PrismQueryLanguageParserImpl.java
A infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/query/lang/TestQueryValidation.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/mid-9278-annotations-review
Commit: b57fecdec311f8eea61b78e5e2afd35f83924d5f
https://github.com/Evolveum/prism/commit/b57fecdec311f8eea61b78e5e2afd35f83924d5f
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2023-11-30 (Thu, 30 Nov 2023)
Changed paths:
M infra/prism-impl/src/main/resources/xml/ns/public/annotation-3.xsd
Log Message:
-----------
MID-9278 added display=regular to few paths marked lately with operational annotation, also added support for display=regular to prism wrappers
Commit: bda6a354bc08421171f7dfb0e2a13bd4a5e18dd2
https://github.com/Evolveum/prism/commit/bda6a354bc08421171f7dfb0e2a13bd4a5e18dd2
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2023-11-30 (Thu, 30 Nov 2023)
Changed paths:
M infra/axiom/src/test/resources/prism/old/common-core.axiom
M infra/axiom/src/test/resources/prism/old/common-core.prism
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Definition.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.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/PrismContainerValueImpl.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
M infra/prism-impl/src/main/resources/xml/ns/test/foo-1.xsd
Log Message:
-----------
MID-9278 small refactoring/cleanup after pre-merge review
Compare: https://github.com/Evolveum/prism/compare/b8ae9506f402...bda6a354bc08
More information about the midPoint-svn
mailing list