openmrs-core master

• 

  Ryan McCauley <32387857+k4pran@users.noreply.github.com> 28 Nov 2023 34e99e916cdfc60dea0264a837c3b02a142edd70

  TRUNK-6202 Replace Hibernate Criteria API with JPA for HibernateConditionDAO (#4469)

  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConditionDAO.java (version 34e99e916cdfc60dea0264a837c3b02a142edd70)
• 

  Tusha <mujuzimoses@gmail.com> 28 Nov 2023 7dec4a7d7190b0c7a74170e869a81c08c61fc6bd

  TRUNK-6192: NameSupport.java to provide for NameTemplate overriding via a GP (#4419)
  * TRUNK-6192: NameSupport.java to provide for NameTemplate overriding via a GP
  
  * TRUNK-6192: NameSupport.java to provide for NameTemplate overriding via a GP
  
  * TRUNK-6192: f53c661e5 TRUNK-6192: NameSupport.java to provide for NameTemplate overriding via a GP
  
  * TRUNK-6192: NameSupport.java to provide for NameTemplate overriding via a GP
  
  * TRUNK-6192: NameSupport to support custom configured name templates
  
  * Address PR reviews.
  
  * Address reviews
  
  * Remove redundant synchronized block.
  
  * Remove protected scope in favour of private scope
  
  ---------
  
  Co-authored-by: ruhanga <ruhanganathan@gmail.com>

  • api/src/main/java/org/openmrs/layout/name/NameSupport.java (version 7dec4a7d7190b0c7a74170e869a81c08c61fc6bd)
  • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version 7dec4a7d7190b0c7a74170e869a81c08c61fc6bd)
  • api/src/test/java/org/openmrs/layout/name/NameTemplateTest.java (version 7dec4a7d7190b0c7a74170e869a81c08c61fc6bd)
  • api/src/test/resources/org/openmrs/include/nameSupportTestDataSet.xml (version 7dec4a7d7190b0c7a74170e869a81c08c61fc6bd)