Code commits
Git
-
JaiVora <52439248+JaiVora@users.noreply.github.com> 34279169d4b6fd933bea71a4db1b995d46fcdabd
[TRUNK-5907]: Migrated `ConceptReferenceTermMap` from Hibernate XML Mapping to JPA Annotations (#5205)
* TRUNK-5907: Migrate `ConceptReferenceTermMap` from Hibernate XML Mapping to JPA annotations
* TRUNK-5907: Migrate `ConceptReferenceTermMap` from Hibernate XML Mapping to JPA annotations
* fix merge conflicts
---------
Co-authored-by: Jai Vora <jaivora@Jais-MacBook-Pro.local>- api/src/main/java/org/openmrs/BaseConceptMap.java (version 34279169d4b6fd933bea71a4db1b995d46fcdabd)
- api/src/main/java/org/openmrs/ConceptReferenceTermMap.java (version 34279169d4b6fd933bea71a4db1b995d46fcdabd)
- api/src/main/resources/hibernate.cfg.xml (version 34279169d4b6fd933bea71a4db1b995d46fcdabd)
- api/src/main/resources/org/openmrs/api/db/hibernate/ConceptReferenceTermMap.hbm.xml (version 34279169d4b6fd933bea71a4db1b995d46fcdabd)
- api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 34279169d4b6fd933bea71a4db1b995d46fcdabd)
-
Deborah Nakamatte <denakamatte@gmail.com> ea5987fe49c4510505ed364724bd3a3ea9f56fa2
TRUNK-5840: Migrate OrderGroup from Hibernate Mapping XML to JPA annotations (#5100)
* Updated OrderGroup with cleaner annotations after a hard reset
* Updated OrderGroup with cleaner annotations after a hard reset
* Updated annotations on OrderGroup Set & OrderGroup fields in OrderGroup Entity
* Updated imports for annotations in OrderGroup from javax to jarkata
* Aligned annotations for Private List field with the hbm file for OrderGroup
* Updated the OneToMany relationship mapping for List Ordersfield & re-instated LazyCollection annotation on the same field
* Updated annotations for orders list and added annotated OrderGroup class to OrderServiceTest
* Updated OrderGroup by adding the attributes field & aligned the rest of the annotations- api/src/main/java/org/openmrs/OrderGroup.java (version ea5987fe49c4510505ed364724bd3a3ea9f56fa2)
- api/src/main/resources/hibernate.cfg.xml (version ea5987fe49c4510505ed364724bd3a3ea9f56fa2)
- api/src/main/resources/org/openmrs/api/db/hibernate/OrderGroup.hbm.xml (version ea5987fe49c4510505ed364724bd3a3ea9f56fa2)
- api/src/test/java/org/openmrs/api/OrderServiceTest.java (version ea5987fe49c4510505ed364724bd3a3ea9f56fa2)
-
Daniel Kayiwa 8ab094f0e3274e280c28ecc57ee5826a68c6473e
Revert "TRUNK-6388: Upgrade Tomcat to 10.1.16 (#5203)" (#5204)
This reverts commit a49081ca24db177cbc882c8ea2da46acec83d3d6.- Dockerfile (version 8ab094f0e3274e280c28ecc57ee5826a68c6473e)
-
kulksaur <46800919+kulksaur@users.noreply.github.com> efc771ed6cf6ac198615694f330e5d5f1130d39b
TRUNK-5910 ConceptStateConversion Domain - Switching from Hibernate Mappings to Annotations (#5200)
* TRUNK-5910 Converting the ConceptStateConversion XML mapping to annotation.
Converted the ConceptStateConversion class Hibernate XML mapping to Annotation.
Removed the hbm.xml associated with the class.
Updated the tests to make sure the class is available for tests.
* TRUNK-5910 Converting the ConceptStateConversion XML mapping to annotation.
Converted the ConceptStateConversion class Hibernate XML mapping to Annotation.
Removed the hbm.xml associated with the class.
Updated the tests to make sure the class is available for tests.
* Updated the formatting for OrderServiceTest
Updated the formatting as it was difficult to identify the changes coming through this ticket.
---------
Co-authored-by: Wikum Weerakutti <wikum@linuxdeveloper.space>- api/src/main/java/org/openmrs/ConceptStateConversion.java (version efc771ed6cf6ac198615694f330e5d5f1130d39b)
- api/src/main/resources/hibernate.cfg.xml (version efc771ed6cf6ac198615694f330e5d5f1130d39b)
- api/src/main/resources/org/openmrs/api/db/hibernate/ConceptStateConversion.hbm.xml (version efc771ed6cf6ac198615694f330e5d5f1130d39b)
- api/src/test/java/org/openmrs/api/OrderServiceTest.java (version efc771ed6cf6ac198615694f330e5d5f1130d39b)