OWLAP-51: Effectivetime restore updates #338
Merged
Conversation
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
added 13 commits
March 29, 2019 14:02
... on property changes
…lationship-support' into feature/OWLAP-51_effectivetime_restore_updates
... relationship component types
cmark
requested changes
Apr 3, 2019
| && memberToRestore.getCharacteristicTypeId().equals(previousMember.getProperties().get(SnomedRf2Headers.FIELD_CHARACTERISTIC_TYPE_ID)) | ||
| && memberToRestore.getTypeId().equals(previousMember.getProperties().get(SnomedRf2Headers.FIELD_TYPE_ID)) | ||
| && memberToRestore.getGroup() == ((Integer )previousMember.getProperties().get(SnomedRf2Headers.FIELD_RELATIONSHIP_GROUP)).intValue(); | ||
| } else if(componentToRestore instanceof SnomedDescriptionTypeRefSetMember) { |
There was a problem hiding this comment.
This doesn't look the same inside my IDE.
| final String previousRuleStrengthId = (String) previousMember.getProperties().get(SnomedRf2Headers.FIELD_MRCM_RULE_STRENGTH_ID); | ||
| final String previousContentTypeId = (String) previousMember.getProperties().get(SnomedRf2Headers.FIELD_MRCM_CONTENT_TYPE_ID); | ||
|
|
||
| if (previousdGrouped != null && previousdGrouped.booleanValue() != memberToRestore.isGrouped()) { |
| return false; | ||
| } | ||
|
|
||
| if (previousAtributeInGroupCardinality != null && !previousAtributeInGroupCardinality.equals(memberToRestore.getAttributeInGroupCardinality())) { |
| final String previousDomainTemplateForPostcoordination = (String) previousMember.getProperties().get(SnomedRf2Headers.FIELD_MRCM_DOMAIN_TEMPLATE_FOR_POSTCOORDINATION); | ||
| final String previousEditorialGuideReference = (String) previousMember.getProperties().get(SnomedRf2Headers.FIELD_MRCM_EDITORIAL_GUIDE_REFERENCE); | ||
|
|
||
| if (previousDomainConstraint != null && !previousDomainConstraint.equals(memberToRestore.getDomainConstraint())) { |
There was a problem hiding this comment.
Use java.util.Objects.equals() to eliminate unnecessary null checks.
| } | ||
|
|
||
| // XXX: Should never happen | ||
| throw new IllegalStateException(); |
There was a problem hiding this comment.
In this case, throw an UnsupportedOperationException or IllegalArgumentException with a proper message.
nagyo
requested changes
Apr 3, 2019
| if (componentsByType.isEmpty()) return; | ||
|
|
||
| final List<String> branchesForPreviousVersion = getAvailableVersionPaths(); | ||
| for (String branch : branchesForPreviousVersion) { |
There was a problem hiding this comment.
This list of branches provided here has the following restrictions:
- the previous version of the component must exist on at least one branch. if we can't find it on any of the branches then we should propagate that upwards. Thoughts @cmark?
- it is not guaranteed that the component exists on all branches
- if we find the component on a branch then we must not look further on the next available branch
There was a problem hiding this comment.
I might even change the two for loops here. First iterate over types and then branches?
| return memberToRestore.isActive() == previousMember.isActive() && memberToRestore.getModuleId().equals(previousMember.getModuleId()); | ||
| } else if (componentToRestore instanceof SnomedMRCMAttributeDomainRefSetMember) { | ||
| final SnomedMRCMAttributeDomainRefSetMember memberToRestore = (SnomedMRCMAttributeDomainRefSetMember) componentToRestore; | ||
| final Boolean previousdGrouped = ClassUtils.checkAndCast(previousMember.getProperties().get(SnomedRf2Headers.FIELD_MRCM_GROUPED), Boolean.class); |
| final SnomedMRCMAttributeDomainRefSetMember memberToRestore = (SnomedMRCMAttributeDomainRefSetMember) componentToRestore; | ||
| final Boolean previousdGrouped = ClassUtils.checkAndCast(previousMember.getProperties().get(SnomedRf2Headers.FIELD_MRCM_GROUPED), Boolean.class); | ||
| final String previousAttributeCardinality = (String) previousMember.getProperties().get(SnomedRf2Headers.FIELD_MRCM_ATTRIBUTE_CARDINALITY); | ||
| final String previousAtributeInGroupCardinality = (String) previousMember.getProperties().get(SnomedRf2Headers.FIELD_MRCM_ATTRIBUTE_IN_GROUP_CARDINALITY); |
| } | ||
| } else { | ||
| throw new UnexpectedTypeException("Unexpected member type '" + componentToRestore.getClass() + "'."); | ||
| } |
There was a problem hiding this comment.
That's quite a long method but we are on a time schedule now, so I guess it should be ok.
| @@ -791,8 +791,11 @@ public void preCommit() { | |||
| } | |||
| } | |||
| } | |||
|
|
|||
| new EffectiveTimeRestorer(getBranch()).restoreEffectiveTimes(transaction.getChangeSetData().getChangedObjects().stream() | |||
There was a problem hiding this comment.
Why not instantiate the restorer in the constructor and just pass the branch to the method?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request adds functionality to restore effective time on members and components.