TRUNK-5929: Switched PersonMergeLog from Hibernate Mappings to Annotations #4936
Conversation
| private Person loser; | ||
|
|
||
| /** | ||
| * serialized data representing the details of the merge | ||
| */ | ||
| @Transient |
There was a problem hiding this comment.
why did you define this as transient?
There was a problem hiding this comment.
I added transient because, without it, a bunch of unit test cases were failing. I also explored an alternative approach that worked without causing any test failures, but it required configuring a very large character length (around 2000 characters) for for this field, like this:
@Column(name = "merged_data", nullable = false, length = 2000)
private String serializedMergedData;
Additionally, the previous PR created for this issue (which was later closed and not merged) also included transient, so I assumed it would be fine to add it rather than configuring an unnecessarily large character length.
If this approach is not ideal, is there a better way to resolve this?
There was a problem hiding this comment.
| @Transient | |
| @Column(name = "merged_data", nullable = false, length = 2000) | |
| @Lob |
add @Lob` annotation
Ok. I'll do it. |
dulmik2003
changed the title
dulmik2003
force-pushed
the
TRUNK-5929
branch
from
bfd6c3d to
ce79bd9
Compare
There was a problem hiding this comment.
Changes Made:
Added PersonMergeLog import.
Registered PersonMergeLog.class using .addAnnotatedClass().
Suggestions:
Ensure test cases cover PersonMergeLog.
Validate dependencies and check for unintended test failures.
Run tests to confirm backward compatibility.
| import javax.persistence.Lob; | ||
| import javax.persistence.ManyToOne; | ||
| import javax.persistence.Table; | ||
|
|
| @@ -26,6 +38,9 @@ | |||
| * @see PersonService#savePersonMergeLog(PersonMergeLog) | |||
| * @since 1.9 | |||
| */ | |||
|
|
|||
| @@ -2730,6 +2731,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th | |||
| .addAnnotatedClass(Relationship.class) | |||
| .addAnnotatedClass(Location.class) | |||
| .addAnnotatedClass(PersonAddress.class) | |||
| .addAnnotatedClass(PersonMergeLog.class) | |||
There was a problem hiding this comment.
Please add this statement at the end, that is, after addAnnotatedClass(OrderType.class) as it can cause conflict with the main file
Description of what I changed
Issue I worked on
see https://openmrs.atlassian.net/browse/TRUNK-5929
Checklist: I completed these to help reviewers :)
My IDE is configured to follow the code style of this project.
No? Unsure? -> configure your IDE, format the code and add the changes with
git add . && git commit --amendI have added tests to cover my changes. (If you refactored
existing code that was well tested you do not have to add tests)
No? -> write tests and add them to this commit
git add . && git commit --amendI ran
mvn clean packageright before creating this pull request andadded all formatting changes to my commit.
No? -> execute above command
All new and existing tests passed.
No? -> figure out why and add the fix to your commit. It is your responsibility to make sure your code works.
My pull request is based on the latest changes of the master branch.
No? Unsure? -> execute command
git pull --rebase upstream master