[midPoint-git] [Evolveum/midpoint] a6e2be: Merge remote-tracking branch 'origin/feature/compl...
Tadeas Chrapovic
noreply at github.com
Thu Sep 4 13:45:54 CEST 2025
Branch: refs/heads/feature/smart-integration-gui
Home: https://github.com/Evolveum/midpoint
Commit: a6e2be26db586b4353b7bedff08b7d2efd9d77e2
https://github.com/Evolveum/midpoint/commit/a6e2be26db586b4353b7bedff08b7d2efd9d77e2
Author: Michal Zelencik <michal.zelencik at evolveum.com>
Date: 2025-09-03 (Wed, 03 Sep 2025)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/wrapper/HeterogenousContainerWrapperFactory.java
M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/AbstractModernObjectDummyConnector.java
M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/AbstractObjectDummyConnector.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/LinkClassDefinition.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/config/AbstractResourceDataDefinitionConfigItem.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/config/AbstractResourceObjectDefinitionConfigItem.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/config/AbstractResourceObjectTypeDefinitionConfigItem.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/config/AssociatedResourceObjectTypeDefinitionConfigItem.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/config/ComplexAttributeTypeDefinitionConfigItem.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/config/ResourceDataTypeDefinitionConfigItem.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/config/ResourceObjectClassDefinitionConfigItem.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/config/ResourceObjectDefinitionConfigItem.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/config/ResourceObjectTypeDefinitionConfigItem.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/config/SchemaHandlingConfigItem.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/config/ShadowAssociationTypeDefinitionConfigItem.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/MidPointConstants.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/NativeObjectClassUcfDefinition.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/NativeShadowAttributeDefinition.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/NativeShadowAttributeDefinitionImpl.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/NativeShadowReferenceAttributeDefinition.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceDefinitionFeatures.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectInboundProcessingDefinition.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceSchemaParser.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ShadowMarkingRules.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ShadowReferenceAttributeDefinition.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ShadowReferenceAttributeDefinitionImpl.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/SynchronizationReactionDefinition.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-provisioning-3.xsd
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-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/ComplexAttributeSynchronizationExpressionEvaluator.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/ComplexAttributeSynchronizationExpressionEvaluatorFactory.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/inbounds/prep/LimitedInboundsSource.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/inbounds/prep/MappedSourceItem.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/PreMappingsEvaluator.java
M model/model-impl/src/main/resources/ctx-model.xml
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/associations/TestAssociations.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/complexAttributes/TestComplexAttributes.java
A model/model-intest/src/test/resources/complex-attributes/archetype-person.xml
A model/model-intest/src/test/resources/complex-attributes/resource-dummy-address-book.xml
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/ShadowPostProcessor.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/ShadowsLocalBeans.java
A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyComplexAttributes.java
A provisioning/provisioning-impl/src/test/resources/dummy/resource-dummy-address-book.xml
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/AbstractModificationConverter.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdCapabilitiesAndSchemaParser.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdObjectConvertor.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdSchemaParser.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdToUcfObjectConversion.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdTypeMapper.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractDummyScenario.java
A repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAddressBookScenario.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/ShadowAsserter.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/ShadowReferenceAttributeAsserter.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/ShadowReferenceAttributeValueAsserter.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/prism/PrismContainerValueAsserter.java
Log Message:
-----------
Merge remote-tracking branch 'origin/feature/complex-attributes' into feature/descriptive-item-path
Commit: 696b82c5d92d70d23c7d9b83409683a67022c075
https://github.com/Evolveum/midpoint/commit/696b82c5d92d70d23c7d9b83409683a67022c075
Author: Michal Zelencik <michal.zelencik at evolveum.com>
Date: 2025-09-04 (Thu, 04 Sep 2025)
Changed paths:
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/smart/TestSmartIntegrationService.java
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/smart/MockServiceClientImpl.java
M model/smart-impl/pom.xml
M model/smart-impl/src/main/java/com/evolveum/midpoint/smart/impl/CorrelationSuggestionOperation.java
M model/smart-impl/src/main/java/com/evolveum/midpoint/smart/impl/DescriptiveItemPath.java
M model/smart-impl/src/main/java/com/evolveum/midpoint/smart/impl/PrismComplexTypeDefinitionSerializer.java
M model/smart-impl/src/main/java/com/evolveum/midpoint/smart/impl/ResourceObjectClassSchemaSerializer.java
M model/smart-impl/src/main/java/com/evolveum/midpoint/smart/impl/SchemaSerializer.java
M model/smart-impl/src/test/java/com/evolveum/midpoint/smart/impl/TestSmartIntegrationServiceImpl.java
M model/smart-impl/src/test/resources/logback-test.xml
Log Message:
-----------
Implement Descriptive Item Path.
These are the paths to be provided to LLM. They are similar to ItemPath
but they also contain information about the multivalue-ness
of each segment. This is important for LLM to understand the structure
of the data.
Signed-off-by: Michal Zelencik <michal.zelencik at evolveum.com>
Commit: 09804ecf227c28107711ce4da6336bfc23e24c82
https://github.com/Evolveum/midpoint/commit/09804ecf227c28107711ce4da6336bfc23e24c82
Author: Michal Zelencik <michal.zelencik at evolveum.com>
Date: 2025-09-04 (Thu, 04 Sep 2025)
Changed paths:
M model/smart-impl/pom.xml
Log Message:
-----------
Fix maven dependencies.
Signed-off-by: Michal Zelencik <michal.zelencik at evolveum.com>
Commit: 972a8d0ffd860ae4ce687fa224d47dc28809912d
https://github.com/Evolveum/midpoint/commit/972a8d0ffd860ae4ce687fa224d47dc28809912d
Author: Michal Zelencik <michal.zelencik at evolveum.com>
Date: 2025-09-04 (Thu, 04 Sep 2025)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/smart/PageSmartIntegrationDefiningType.java
M infra/schema/src/main/resources/xml/ns/public/common/common-smart-integration-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-tasks-3.xsd
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/smart/TestSmartIntegrationService.java
M model/smart-api/src/main/java/com/evolveum/midpoint/smart/api/SmartIntegrationService.java
M model/smart-impl/src/main/java/com/evolveum/midpoint/smart/impl/CorrelationSuggestionOperation.java
A model/smart-impl/src/main/java/com/evolveum/midpoint/smart/impl/CorrelatorEvaluator.java
M model/smart-impl/src/main/java/com/evolveum/midpoint/smart/impl/SmartIntegrationServiceImpl.java
M model/smart-impl/src/main/java/com/evolveum/midpoint/smart/impl/TypeOperationContext.java
M model/smart-impl/src/main/java/com/evolveum/midpoint/smart/impl/activities/CorrelationSuggestionActivityHandler.java
M model/smart-impl/src/test/java/com/evolveum/midpoint/smart/impl/TestSmartIntegrationServiceImpl.java
Log Message:
-----------
Merge branch 'feature/smart-integration-service' into feature/descriptive-item-path
# Conflicts:
# model/smart-impl/src/main/java/com/evolveum/midpoint/smart/impl/CorrelationSuggestionOperation.java
# model/smart-impl/src/main/java/com/evolveum/midpoint/smart/impl/DescriptiveItemPath.java
# model/smart-impl/src/test/java/com/evolveum/midpoint/smart/impl/TestSmartIntegrationServiceImpl.java
Commit: d1f2d49ae497bb3b0c1680284472fa6e8a8df0cb
https://github.com/Evolveum/midpoint/commit/d1f2d49ae497bb3b0c1680284472fa6e8a8df0cb
Author: tchrapovic <chrapovic.tadeas at gmail.com>
Date: 2025-09-04 (Thu, 04 Sep 2025)
Changed paths:
M model/smart-impl/src/main/java/com/evolveum/midpoint/smart/impl/DescriptiveItemPath.java
M model/smart-impl/src/test/java/com/evolveum/midpoint/smart/impl/TestSmartIntegrationServiceImpl.java
M model/smart-impl/src/test/resources/logback-test.xml
Log Message:
-----------
Merge branch 'feature/smart-integration-service' into feature/smart-integration-gui
# Conflicts:
# model/smart-impl/pom.xml
Commit: b7502e74096c86eaef0c0d409c3d98395c3d2207
https://github.com/Evolveum/midpoint/commit/b7502e74096c86eaef0c0d409c3d98395c3d2207
Author: tchrapovic <chrapovic.tadeas at gmail.com>
Date: 2025-09-04 (Thu, 04 Sep 2025)
Changed paths:
M model/smart-impl/pom.xml
Log Message:
-----------
Smart integration: add missing mockito dependency
1. Lost during merge conflict.
Compare: https://github.com/Evolveum/midpoint/compare/16204c624cd9...b7502e74096c
To unsubscribe from these emails, change your notification settings at https://github.com/Evolveum/midpoint/settings/notifications
More information about the midPoint-svn
mailing list