TRUNK-5891: ProgramWorkflowState Domain - Switching from Hibernate Mappings to Annotations by Chinmay7070 · Pull Request #5792 · openmrs/openmrs-core

Chinmay7070 · 2026-02-12T19:31:02Z

Description of what I changed

This PR migrates the ProgramWorkflowState entity from Hibernate XML mapping (HBM) to JPA annotations as part of the ongoing JPA migration effort in OpenMRS core.
Changes:

Added JPA annotations to ProgramWorkflowState entity
Configured appropriate @entity, @table, @id, @manytoone, and @column mappings
Retained inheritance from BaseChangeableOpenmrsMetadata
Removed ProgramWorkflowState.hbm.xml
Updated hibernate.cfg.xml to remove XML mapping reference
Added required Liquibase update for metadata-related columns
Updated DatabaseUpdaterDatabaseIT change set count accordingly

Issue I worked on

see https://issues.openmrs.org/browse/TRUNK-5891

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 --amend
I 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 --amend
I ran mvn clean package right before creating this pull request and
added 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

…ML mapping

Chinmay7070 · 2026-02-16T11:00:17Z

Hi @dkayiwa,

All tests are passing successfully on my local machine. However, they are failing on the CI side. Could you please help me understand what might be causing this difference?

Thank you.

dkayiwa · 2026-02-16T19:33:47Z

@Chinmay7070 the failing test has just been fixed in core. Did you take a look at the new sonar issue?

Chinmay7070 · 2026-02-18T13:54:02Z

@dkayiwa please review when you got chance.

dkayiwa · 2026-02-18T14:13:58Z

.github/workflows/dependency-check.yml

            --failOnCVSS 6.2
            --enableRetired
            --suppression dependency-check-suppressions.xml
-            --nvdApiKey ${{ secrets.NVD_API_KEY }}


Is this related to the ticket?

Hi @dkayiwa,

No, this is also not related to TRUNK-5891. I removed the --nvdApiKey line because it was causing the OWASP Dependency Check workflow to fail on fork PRs .
However, if this change should not be part of my PR, I can revert it. Please let me know.

Can we also discard this change?

Yes, I’ll discard this change and update the PR shortly.

dkayiwa · 2026-02-18T14:14:10Z

api/src/main/java/org/openmrs/validator/ObsValidator.java

 			ancestors.add(obs);
-			for (Obs child : obs.getGroupMembers()) {
-				validateHelper(child, errors, ancestors, false);
+			for (Obs child : obs.getGroupMembers(true)) {


Is this related to the ticket?

Hi @dkayiwa,

No, the ObsValidator.java changes are not related to TRUNK-5891. My branch was created before this fix was merged to master, which is why it's showing as a change in the diff. I have now synced my branch with the latest upstream master, so ObsValidator now matches the current version.

So can you remove these?

Yes @dkayiwa, done! I've synced with upstream/master and removed the ObsValidator changes from this PR.

jwnasambu · 2026-02-18T17:07:33Z

api/src/main/java/org/openmrs/ProgramWorkflowState.java

Kindly a space is needed after a comma please!

Suggested change

@AttributeOverride(name = "name",column = @Column(name = "name", nullable = true, length = 255))

@AttributeOverride(name = "name", column = @Column(name = "name", nullable = true, length = 255))

Thank you @jwnasambu
I will add the space after the comma.

jwnasambu · 2026-02-18T17:18:00Z

api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-3.0.x.xml

Kindly fix the comment reference to something like this:

Suggested change

<comment>Add audit columns required by Order JPA mapping for TRUNK-5891</comment>

<comment>Add audit columns required by ProgramWorkflowState JPA mapping for TRUNK-5891</comment>

Thank you @jwnasambu for the review!
the comment should reference ProgramWorkflowState, not Order. I will fix this along with the spacing issue.

…kflowState

codecov-commenter · 2026-02-18T17:40:48Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 58.01%. Comparing base (17479a2) to head (1328811).

Additional details and impacted files

@@             Coverage Diff              @@
##             master    #5792      +/-   ##
============================================
+ Coverage     57.99%   58.01%   +0.01%     
  Complexity     9139     9139              
============================================
  Files           683      683              
  Lines         37058    37058              
  Branches       5420     5420              
============================================
+ Hits          21491    21498       +7     
+ Misses        13654    13651       -3     
+ Partials       1913     1909       -4

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

jwnasambu · 2026-02-18T17:58:30Z

api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-3.0.x.xml

kindly the word shouldn't be truncated as "ProgramWorkflowStat" instead should be full "ProgramWorkflowState"

Suggested change

<comment>Add audit columns required by ProgramWorkflowStat JPA mapping for TRUNK-5891</comment>

Add audit columns required by ProgramWorkflowState JPA mapping for TRUNK-5891

Thanks @jwnasambu for catching both!
Apparently I was being too economical with spaces AND letters 😅 Will fix them!

sonarqubecloud · 2026-02-19T10:56:55Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

Chinmay7070 force-pushed the TRUNK-5891-migrate-programworkflowstate branch from 5a6aaf5 to 59101d7 Compare February 13, 2026 13:04

Chinmay7070 added 2 commits February 13, 2026 18:38

TRUNK-5891: Migrate ProgramWorkflowState from HBM to JPA and remove X…

77079f7

…ML mapping

add ProgramWorkState class in OrderServiceTest

4d8b86e

Chinmay7070 force-pushed the TRUNK-5891-migrate-programworkflowstate branch 2 times, most recently from 298fcf5 to 4d8b86e Compare February 14, 2026 16:20

Chinmay7070 added 4 commits February 14, 2026 22:01

Restore ObsValidator to match master

8c6e73f

Restore Obs to match master

81bbae3

Force restore Obs and ObsValidator to upstream master version

5b2a154

TRUNK-5891: Fix ObsValidator

64402d8

Chinmay7070 force-pushed the TRUNK-5891-migrate-programworkflowstate branch 2 times, most recently from ecc05bb to 64402d8 Compare February 16, 2026 10:45

Chinmay7070 added 2 commits February 17, 2026 18:39

restore ObsValidator from master

1a57056

fix OWASP workflow and update ProgramWorkflowState JPA migration

e396ffe

dkayiwa reviewed Feb 18, 2026

View reviewed changes

jwnasambu reviewed Feb 18, 2026

View reviewed changes

Chinmay7070 force-pushed the TRUNK-5891-migrate-programworkflowstate branch from 6168a94 to e396ffe Compare February 18, 2026 17:16

jwnasambu reviewed Feb 18, 2026

View reviewed changes

fix spacing in annotation and correct comment reference to ProgramWor…

224ea14

…kflowState

jwnasambu reviewed Feb 18, 2026

View reviewed changes

Chinmay7070 added 3 commits February 18, 2026 23:47

fix ProgramWorkflowState

2058766

merge upstream/master to sync branch with latest changes

ff6f7a7

dependency-check.yml

1328811

	@AttributeOverride(name = "name",column = @Column(name = "name", nullable = true, length = 255))
	@AttributeOverride(name = "name", column = @Column(name = "name", nullable = true, length = 255))

	<comment>Add audit columns required by Order JPA mapping for TRUNK-5891</comment>
	<comment>Add audit columns required by ProgramWorkflowState JPA mapping for TRUNK-5891</comment>

	<comment>Add audit columns required by ProgramWorkflowStat JPA mapping for TRUNK-5891</comment>
	Add audit columns required by ProgramWorkflowState JPA mapping for TRUNK-5891

Conversation

Chinmay7070 commented Feb 12, 2026

Description of what I changed

Issue I worked on

Checklist: I completed these to help reviewers :)

Uh oh!

Chinmay7070 commented Feb 16, 2026

Uh oh!

dkayiwa commented Feb 16, 2026

Uh oh!

Chinmay7070 commented Feb 18, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Chinmay7070 Feb 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codecov-commenter commented Feb 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

jwnasambu Feb 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud bot commented Feb 19, 2026

Quality Gate passed

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Comments

Chinmay7070 Feb 18, 2026 •

edited

Loading

codecov-commenter commented Feb 18, 2026 •

edited

Loading

jwnasambu Feb 18, 2026 •

edited

Loading