[midPoint-git] [Evolveum/prism] 091c7f: implement xsd schema and converter for Prism defin...
Dominik Horváth
noreply at github.com
Wed May 22 14:50:49 CEST 2024
Branch: refs/heads/schema-context
Home: https://github.com/Evolveum/prism
Commit: 091c7f13342e3750690ac4c9071f4f945d904ac3
https://github.com/Evolveum/prism/commit/091c7f13342e3750690ac4c9071f4f945d904ac3
Author: skublik <lukas.skublik at gmail.com>
Date: 2024-05-14 (Tue, 14 May 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/DisplayHint.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/schema/SerializableDefinition.java
M infra/prism-codegen/src/main/java/com/evolveum/prism/codegen/impl/ContractGenerator.java
M infra/prism-codegen/src/main/java/com/evolveum/prism/codegen/impl/EnumerationGenerator.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/SchemaRegistryStateImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/features/EnumerationValuesXsomParser.java
M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
Log Message:
-----------
implement xsd schema and converter for Prism definition and xsd schema
Commit: af37854c5d597775227edf926c42c92a367e67f2
https://github.com/Evolveum/prism/commit/af37854c5d597775227edf926c42c92a367e67f2
Author: skublik <lukas.skublik at gmail.com>
Date: 2024-05-14 (Tue, 14 May 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismPresentationDefinition.java
M infra/prism-codegen/src/main/java/com/evolveum/prism/codegen/impl/ContractGenerator.java
M infra/prism-codegen/src/main/java/com/evolveum/prism/codegen/impl/StructuredGenerator.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaDomSerializer.java
M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
Log Message:
-----------
fix issues after review
Commit: c81868faea2a55b12a63b2fbe8c3af40e5bc5d7e
https://github.com/Evolveum/prism/commit/c81868faea2a55b12a63b2fbe8c3af40e5bc5d7e
Author: skublik <lukas.skublik at gmail.com>
Date: 2024-05-14 (Tue, 14 May 2024)
Changed paths:
M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
Log Message:
-----------
fix SchemaProcessorTest in midpoint
Commit: 022b3ca9c72eebe5b25c70c58410290f4d966630
https://github.com/Evolveum/prism/commit/022b3ca9c72eebe5b25c70c58410290f4d966630
Author: skublik <lukas.skublik at gmail.com>
Date: 2024-05-15 (Wed, 15 May 2024)
Changed paths:
R infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/annotation_3/AccessAnnotationType.java
R infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/annotation_3/ObjectFactory.java
R infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/annotation_3/package-info.java
M infra/prism-impl/src/main/resources/xml/ns/public/annotation-3.xsd
Log Message:
-----------
fix compilation error in javadoc
Commit: 802f12a6488a5d00d8ab55069eec6600ec214641
https://github.com/Evolveum/prism/commit/802f12a6488a5d00d8ab55069eec6600ec214641
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-05-15 (Wed, 15 May 2024)
Changed paths:
M 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/key/NaturalKeyDefinitionImpl.java
Log Message:
-----------
fixed transformation from object delta to tree delta and back, tests are green
Commit: 4dfbed138605309fe4f7b5e6be6d035d7dfaab1e
https://github.com/Evolveum/prism/commit/4dfbed138605309fe4f7b5e6be6d035d7dfaab1e
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-05-16 (Thu, 16 May 2024)
Changed paths:
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/BaseItemMerger.java
Log Message:
-----------
fixed forgotten not implemented yet
Commit: a857f502178803a2fae84d8ab27144c835d71633
https://github.com/Evolveum/prism/commit/a857f502178803a2fae84d8ab27144c835d71633
Author: Tony Tkáčik <tonydamage at gmail.com>
Date: 2024-05-20 (Mon, 20 May 2024)
Changed paths:
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaRegistryImpl.java
Log Message:
-----------
MID-9627: Use prefix declared in schema XSD for xml serialization.
Commit: f0dd95517ba05edbe3bf963cda23466d1ae923ff
https://github.com/Evolveum/prism/commit/f0dd95517ba05edbe3bf963cda23466d1ae923ff
Author: Tony Tkáčik <tonydamage at gmail.com>
Date: 2024-05-20 (Mon, 20 May 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/query/QueryConverter.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/QueryConverterImpl.java
Log Message:
-----------
Added new variant of createSearchType with option to force conversion to MQL
Commit: 8a96247e339a2e5a5197fd34a57b44e2f538a586
https://github.com/Evolveum/prism/commit/8a96247e339a2e5a5197fd34a57b44e2f538a586
Author: Tony Tkáčik <tonydamage at gmail.com>
Date: 2024-05-20 (Mon, 20 May 2024)
Changed paths:
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/xml/GlobalDynamicNamespacePrefixMapper.java
Log Message:
-----------
Make registerGlobalPrefix public
Signed-off-by: Tony Tkáčik <tonydamage at gmail.com>
Commit: b101328ac0458eab3b1b6b7159cd4ae5188730cf
https://github.com/Evolveum/prism/commit/b101328ac0458eab3b1b6b7159cd4ae5188730cf
Author: Tony Tkáčik <tonydamage at gmail.com>
Date: 2024-05-21 (Tue, 21 May 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/path/ItemName.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java
M infra/prism-codegen/src/main/java/com/evolveum/prism/codegen/impl/ContractGenerator.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/schema/SchemaXsomParser.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/xnode/XNodeDefinition.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestExtraSchema.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/AccountType.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/ActivationType.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/AssignmentType.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/ObjectType.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/ResourceType.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/UserType.java
Log Message:
-----------
Internalize ItemNames without prefix
Introduced subclass which represents ItemName without prefix specified.
Instances of subclass are internalized, so in theory all hash map searches
should use same instance, which can speed things up.
Commit: 5a4f650d9ecc1578d976bc64929420966eb31d67
https://github.com/Evolveum/prism/commit/5a4f650d9ecc1578d976bc64929420966eb31d67
Author: Tony Tkáčik <tonydamage at gmail.com>
Date: 2024-05-22 (Wed, 22 May 2024)
Changed paths:
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/lex/LexicalProcessor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/lex/dom/DomLexicalProcessor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/lex/json/DelegatingLexicalProcessor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/lex/json/NullLexicalProcessor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/lex/json/reader/AbstractReader.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/lex/json/reader/JsonReadingContext.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/xnode/XNodeDefinition.java
Log Message:
-----------
JSON Parser: Use provided item definition to skip registry lookup
JSON parser (and other lexical processors) did not used provided
Item Definition during their parsing.
Updated lexer API to allow for item definition to be passed.
Updated XNodeDefinition with new type, root expecting concrete item.
If item name matches uses provided item definition, otherwise fallback
to original behaviour.
This reduces lookups into schema registry if parser is constructed correctly
in repository code (Where we known item definition beforehand).
Commit: cf84baf9d0e44d3534382cf63767b2bd2e463c34
https://github.com/Evolveum/prism/commit/cf84baf9d0e44d3534382cf63767b2bd2e463c34
Author: Tony Tkáčik <tonydamage at gmail.com>
Date: 2024-05-22 (Wed, 22 May 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistryState.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
Log Message:
-----------
Schema Registry State: Introduced caching od derived items.
Sometimes other components needs to retrieve information from schema
registry and cache it. Usually it was done by caching the result in
private field, which does work, but will not react to schema changes.
Introduced cache API into schema state which uses derivation key
(component specific key) and provided function to compute and cache
this types of values.
Users of the API should not cache returned values, but rather always
call this method on schema state (value will be cached there).
Commit: 1d5ca76a51266cce1c27d5155d0349dd0e9f8e70
https://github.com/Evolveum/prism/commit/1d5ca76a51266cce1c27d5155d0349dd0e9f8e70
Author: Tony Tkáčik <tonydamage at gmail.com>
Date: 2024-05-22 (Wed, 22 May 2024)
Changed paths:
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/xnode/XNodeDefinition.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestPrismParsingJson.java
Log Message:
-----------
Fixed JSON tests
Commit: aade62c32567b420f7b5258d7e9bd1df4be56ed9
https://github.com/Evolveum/prism/commit/aade62c32567b420f7b5258d7e9bd1df4be56ed9
Author: dominikhorvath <dominikhorvath138 at gmail.com>
Date: 2024-05-22 (Wed, 22 May 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/DisplayHint.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/PrismPresentationDefinition.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/key/NaturalKeyDefinition.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/path/ItemName.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/query/QueryConverter.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/schema/SerializableDefinition.java
R infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/annotation_3/AccessAnnotationType.java
R infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/annotation_3/ObjectFactory.java
R infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/annotation_3/package-info.java
M infra/prism-codegen/src/main/java/com/evolveum/prism/codegen/impl/ContractGenerator.java
M infra/prism-codegen/src/main/java/com/evolveum/prism/codegen/impl/EnumerationGenerator.java
M infra/prism-codegen/src/main/java/com/evolveum/prism/codegen/impl/StructuredGenerator.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/ItemDefinitionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/key/NaturalKeyDefinitionImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/QueryConverterImpl.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/features/EnumerationValuesXsomParser.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/xml/GlobalDynamicNamespacePrefixMapper.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/xnode/XNodeDefinition.java
M infra/prism-impl/src/main/resources/xml/ns/public/annotation-3.xsd
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestExtraSchema.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/AccountType.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/ActivationType.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/AssignmentType.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/ObjectType.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/ResourceType.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/UserType.java
M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
Log Message:
-----------
Merge branch 'refs/heads/master' into schema-context
Commit: 1618920e8a9f6ef8350df288d4f32ec8f8b62749
https://github.com/Evolveum/prism/commit/1618920e8a9f6ef8350df288d4f32ec8f8b62749
Author: Tony Tkáčik <tonydamage at gmail.com>
Date: 2024-05-22 (Wed, 22 May 2024)
Changed paths:
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/xnode/XNodeDefinition.java
Log Message:
-----------
Json Fixed QName parsing: Do not return ItemName when parser asks for QName explicitly
Commit: 6c8287337be2d01077a83ccb20f39f57e6432ff0
https://github.com/Evolveum/prism/commit/6c8287337be2d01077a83ccb20f39f57e6432ff0
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-05-22 (Wed, 22 May 2024)
Changed paths:
M infra/prism-impl/src/main/resources/xml/ns/test/foo-1.xsd
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestPrismContext.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/AssignmentType.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/UserType.java
Log Message:
-----------
natural key annotation test - definition on complex type vs definition on element
Commit: 9f672ac7e2713333edcaee25ec98a4e85ef5225c
https://github.com/Evolveum/prism/commit/9f672ac7e2713333edcaee25ec98a4e85ef5225c
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2024-05-22 (Wed, 22 May 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistryState.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/lex/LexicalProcessor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/lex/dom/DomLexicalProcessor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/lex/json/DelegatingLexicalProcessor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/lex/json/NullLexicalProcessor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/lex/json/reader/AbstractReader.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/lex/json/reader/JsonReadingContext.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/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/xnode/XNodeDefinition.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestPrismParsingJson.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Commit: 07b35584933e0c142b5a0f21c29f3d28cc3eb37f
https://github.com/Evolveum/prism/commit/07b35584933e0c142b5a0f21c29f3d28cc3eb37f
Author: dominikhorvath <dominikhorvath138 at gmail.com>
Date: 2024-05-22 (Wed, 22 May 2024)
Changed paths:
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistryState.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/lex/LexicalProcessor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/lex/dom/DomLexicalProcessor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/lex/json/DelegatingLexicalProcessor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/lex/json/NullLexicalProcessor.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/lex/json/reader/AbstractReader.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/lex/json/reader/JsonReadingContext.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/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/xnode/XNodeDefinition.java
M infra/prism-impl/src/main/resources/xml/ns/test/foo-1.xsd
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestPrismContext.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestPrismParsingJson.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/AssignmentType.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/foo/UserType.java
Log Message:
-----------
Merge branch 'refs/heads/master' into schema-context
Compare: https://github.com/Evolveum/prism/compare/c8010242d872...07b35584933e
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