Skip to content

TRUNK-5911: Migrate ConceptStopWord to JPA annotations #5378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+20 −37
Open

TRUNK-5911: Migrate ConceptStopWord to JPA annotations #5378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b1eaa8
TRUNK-5911: Migrate ConceptStopWord to JPA annotations
pidsonn Oct 28, 2025
ee0b8c1
TRUNK-5911: Set concept_stop_word_id as non-nullable
pidsonn Nov 8, 2025
60c00f0
TRUNK-5911:Update hibernate.cfg.xml
pidsonn Nov 25, 2025
6832625
TRUNK-5911: Add missing length attributes for ConceptStopWord fields
pidsonn Nov 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions api/src/main/java/org/openmrs/ConceptStopWord.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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", nullable = false)
private Integer conceptStopWordId;


@Column(name = "word", nullable = false, length = 50)
private String value;


@Column(name = "locale", nullable = false, length = 20)
private Locale locale;

// Constructors
Expand Down
4 changes: 2 additions & 2 deletions api/src/main/resources/hibernate.cfg.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<mapping resource="org/openmrs/api/db/hibernate/ConceptName.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/ConceptProposal.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/ConceptSet.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/ConceptStopWord.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/DiagnosisAttribute.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/DiagnosisAttributeType.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/FieldType.hbm.xml" />
Expand Down Expand Up @@ -75,6 +74,7 @@
<!-- These mappings are required because of references in Obs & Concept -->
<mapping class="org.openmrs.ObsReferenceRange"/>
<mapping class="org.openmrs.ConceptReferenceRange"/>
</session-factory>

</session-factory>

</hibernate-configuration>
33 changes: 0 additions & 33 deletions api/src/main/resources/org/openmrs/api/db/hibernate/ConceptStopWord.hbm.xml
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions api/src/test/java/org/openmrs/api/OrderServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down
Loading