From 7b1eaa8b72ce247a89e27a089fecdebb14b276e3 Mon Sep 17 00:00:00 2001 From: Muturane Pidson Date: Tue, 28 Oct 2025 22:51:29 +0300 Subject: [PATCH 1/4] TRUNK-5911: Migrate ConceptStopWord to JPA annotations --- .../java/org/openmrs/ConceptStopWord.java | 18 ++++++++-- api/src/main/resources/hibernate.cfg.xml | 6 ++-- .../api/db/hibernate/ConceptStopWord.hbm.xml | 33 ------------------- .../org/openmrs/api/OrderServiceTest.java | 2 ++ 4 files changed, 22 insertions(+), 37 deletions(-) delete mode 100644 api/src/main/resources/org/openmrs/api/db/hibernate/ConceptStopWord.hbm.xml diff --git a/api/src/main/java/org/openmrs/ConceptStopWord.java b/api/src/main/java/org/openmrs/ConceptStopWord.java index d49508ac9883..7c01f538aeeb 100644 --- a/api/src/main/java/org/openmrs/ConceptStopWord.java +++ b/api/src/main/java/org/openmrs/ConceptStopWord.java @@ -14,6 +14,13 @@ import org.hibernate.envers.Audited; import org.openmrs.api.context.Context; import org.springframework.util.StringUtils; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.Id; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Column; + /** * ConceptStopWord is the real world term used to filter the words for indexing @@ -23,15 +30,22 @@ * @since 1.8 */ @Audited +@Entity +@Table(name = "concept_stop_word") public class ConceptStopWord extends BaseOpenmrsObject { private static final long serialVersionUID = 3671020002642184656L; // Fields + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "concept_stop_word_id") private Integer conceptStopWordId; - + + @Column(name = "word", nullable = false) private String value; - + + @Column(name = "locale", nullable = false) private Locale locale; // Constructors diff --git a/api/src/main/resources/hibernate.cfg.xml b/api/src/main/resources/hibernate.cfg.xml index 3a12ab71b2b0..bef53dbe1d0d 100644 --- a/api/src/main/resources/hibernate.cfg.xml +++ b/api/src/main/resources/hibernate.cfg.xml @@ -25,7 +25,6 @@ - @@ -75,6 +74,9 @@ - + + + + diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptStopWord.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptStopWord.hbm.xml deleted file mode 100644 index 10577889bc0f..000000000000 --- a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptStopWord.hbm.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - concept_stop_word_concept_stop_word_id_seq - - - - - - - - - diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java index bb55bb4be7c9..45b85e939eea 100644 --- a/api/src/test/java/org/openmrs/api/OrderServiceTest.java +++ b/api/src/test/java/org/openmrs/api/OrderServiceTest.java @@ -36,6 +36,7 @@ import org.openmrs.ConceptSource; import org.openmrs.ConceptStateConversion; import org.openmrs.ConceptReferenceTermMap; +import org.openmrs.ConceptStopWord; import org.openmrs.Condition; import org.openmrs.Diagnosis; import org.openmrs.Drug; @@ -2914,6 +2915,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th .addAnnotatedClass(ConceptDescription.class) .addAnnotatedClass(ConceptClass.class) .addAnnotatedClass(ConceptMap.class) + .addAnnotatedClass(ConceptStopWord.class) .addAnnotatedClass(FormResource.class) .addAnnotatedClass(VisitType.class) .addAnnotatedClass(ProviderRole.class) From ee0b8c1e4c32588e28b4e1a7dfbf2cbc10939f4b Mon Sep 17 00:00:00 2001 From: Muturane Pidson Date: Sat, 8 Nov 2025 22:48:31 +0300 Subject: [PATCH 2/4] TRUNK-5911: Set concept_stop_word_id as non-nullable --- api/src/main/java/org/openmrs/ConceptStopWord.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/main/java/org/openmrs/ConceptStopWord.java b/api/src/main/java/org/openmrs/ConceptStopWord.java index 7c01f538aeeb..d23dd9b8a487 100644 --- a/api/src/main/java/org/openmrs/ConceptStopWord.java +++ b/api/src/main/java/org/openmrs/ConceptStopWord.java @@ -39,7 +39,7 @@ public class ConceptStopWord extends BaseOpenmrsObject { // Fields @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "concept_stop_word_id") + @Column(name = "concept_stop_word_id", nullable = false) private Integer conceptStopWordId; @Column(name = "word", nullable = false) From 60c00f0d66d4a40147db83d270eb08cd30e0e239 Mon Sep 17 00:00:00 2001 From: Muturane Pidson Date: Tue, 25 Nov 2025 16:49:09 +0300 Subject: [PATCH 3/4] TRUNK-5911:Update hibernate.cfg.xml --- api/src/main/resources/hibernate.cfg.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/api/src/main/resources/hibernate.cfg.xml b/api/src/main/resources/hibernate.cfg.xml index bef53dbe1d0d..98c762b87d98 100644 --- a/api/src/main/resources/hibernate.cfg.xml +++ b/api/src/main/resources/hibernate.cfg.xml @@ -75,8 +75,6 @@ - - From 683262521cdf8ff8082f9a72f448a259f7eda5c8 Mon Sep 17 00:00:00 2001 From: Muturane Pidson Date: Wed, 26 Nov 2025 12:59:05 +0300 Subject: [PATCH 4/4] TRUNK-5911: Add missing length attributes for ConceptStopWord fields --- api/src/main/java/org/openmrs/ConceptStopWord.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/org/openmrs/ConceptStopWord.java b/api/src/main/java/org/openmrs/ConceptStopWord.java index d23dd9b8a487..d8b8712ddd3d 100644 --- a/api/src/main/java/org/openmrs/ConceptStopWord.java +++ b/api/src/main/java/org/openmrs/ConceptStopWord.java @@ -42,10 +42,10 @@ public class ConceptStopWord extends BaseOpenmrsObject { @Column(name = "concept_stop_word_id", nullable = false) private Integer conceptStopWordId; - @Column(name = "word", nullable = false) + @Column(name = "word", nullable = false, length = 50) private String value; - @Column(name = "locale", nullable = false) + @Column(name = "locale", nullable = false, length = 20) private Locale locale; // Constructors