-
Notifications
You must be signed in to change notification settings - Fork 188
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feature/tag-experiment' into feature/simulations
# Conflicts: # infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd # model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ClockworkAuditHelper.java # model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java # model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/simulation/AbstractBasicSimulationExecutionTest.java # model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/simulation/AbstractSimulationsTest.java # model/model-intest/src/test/resources/simulation/system-configuration.xml # repo/task-api/src/main/java/com/evolveum/midpoint/task/api/AggregatedObjectProcessingListener.java
- Loading branch information
Showing
16 changed files
with
229 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
model/model-intest/src/test/resources/simulation/tag-user-add.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <!-- | ||
| ~ Copyright (C) 2010-2022 Evolveum and contributors | ||
| ~ | ||
| ~ This work is dual-licensed under the Apache License 2.0 | ||
| ~ and European Union Public License. See LICENSE file for details. | ||
| --> | ||
|
|
||
| <tag xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" | ||
| oid="0c31f3a1-a7b1-4fad-8cea-eaafdc15daaf"> | ||
| <name>user-add</name> | ||
| </tag> |
11 changes: 11 additions & 0 deletions
11
model/model-intest/src/test/resources/simulation/tag-user-delete.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <!-- | ||
| ~ Copyright (C) 2010-2022 Evolveum and contributors | ||
| ~ | ||
| ~ This work is dual-licensed under the Apache License 2.0 | ||
| ~ and European Union Public License. See LICENSE file for details. | ||
| --> | ||
|
|
||
| <tag xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" | ||
| oid="caa2921a-6cf4-4e70-ad2b-bfed278e29cf"> | ||
| <name>user-delete</name> | ||
| </tag> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 61 additions & 0 deletions
61
repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTag.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /* | ||
| * Copyright (C) 2010-2021 Evolveum and contributors | ||
| * | ||
| * This work is dual-licensed under the Apache License 2.0 | ||
| * and European Union Public License. See LICENSE file for details. | ||
| */ | ||
| package com.evolveum.midpoint.repo.sql.data.common; | ||
|
|
||
| import com.evolveum.midpoint.repo.sql.data.RepositoryContext; | ||
| import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString; | ||
| import com.evolveum.midpoint.repo.sql.query.definition.JaxbName; | ||
| import com.evolveum.midpoint.repo.sql.query.definition.NeverNull; | ||
| import com.evolveum.midpoint.repo.sql.util.DtoTranslationException; | ||
| import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; | ||
| import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; | ||
|
|
||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.TagType; | ||
|
|
||
| import org.hibernate.annotations.DynamicUpdate; | ||
| import org.hibernate.annotations.ForeignKey; | ||
| import org.hibernate.annotations.Persister; | ||
|
|
||
| import javax.persistence.*; | ||
|
|
||
| @Entity | ||
| @ForeignKey(name = "fk_tag") | ||
| @Table(uniqueConstraints = @UniqueConstraint(name = "uc_tag_name", columnNames = { "name_norm" }), | ||
| indexes = { | ||
| @Index(name = "iTagNameOrig", columnList = "name_orig"), | ||
| } | ||
| ) | ||
| @Persister(impl = MidPointJoinedPersister.class) | ||
| @DynamicUpdate | ||
| public class RTag extends RFocus { | ||
|
|
||
| private RPolyString nameCopy; | ||
|
|
||
| @JaxbName(localPart = "name") | ||
| @AttributeOverrides({ | ||
| @AttributeOverride(name = "orig", column = @Column(name = "name_orig")), | ||
| @AttributeOverride(name = "norm", column = @Column(name = "name_norm")) | ||
| }) | ||
| @Embedded | ||
| @NeverNull | ||
| public RPolyString getNameCopy() { | ||
| return nameCopy; | ||
| } | ||
|
|
||
| public void setNameCopy(RPolyString nameCopy) { | ||
| this.nameCopy = nameCopy; | ||
| } | ||
|
|
||
| // dynamically called | ||
| public static void copyFromJAXB( | ||
| TagType jaxb, RTag repo, RepositoryContext repositoryContext, | ||
| IdGeneratorResult generatorResult) throws DtoTranslationException { | ||
| copyFocusInformationFromJAXB(jaxb, repo, repositoryContext, generatorResult); | ||
|
|
||
| repo.setNameCopy(RPolyString.copyFromJAXB(jaxb.getName())); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.