Skip to content

TRUNK-5822: Switch FormField domain from hbm.xml to JPA annotations #5549

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 2 commits into
base: master
Choose a base branch
from
+39 −91
Open

TRUNK-5822: Switch FormField domain from hbm.xml to JPA annotations #5549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a45c31
TRUNK-5822: Switch FormField domain from hbm.xml to JPA annotations
pidsonn Dec 2, 2025
b16eb54
Merge branch 'master' into TRUNK-5822
pidsonn Dec 2, 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
48 changes: 37 additions & 11 deletions api/src/main/java/org/openmrs/FormField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@
import java.io.Serializable;
import java.util.Comparator;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.hibernate.envers.Audited;

Expand All @@ -24,32 +32,50 @@
* @see org.openmrs.Field
*/
@Audited
@Entity
@Table(name = "form_field")
public class FormField extends BaseChangeableOpenmrsMetadata implements java.io.Serializable, Comparable<FormField> {

public static final long serialVersionUID = 3456L;

// Fields


@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "form_field_id", nullable = false)
protected Integer formFieldId;


@ManyToOne
@JoinColumn(name = "parent_form_field")
protected FormField parent;


@ManyToOne(optional = false)
@JoinColumn(name = "form_id", nullable = false)
protected Form form;


@ManyToOne(optional = false)
@JoinColumn(name = "field_id", nullable = false)
protected Field field;


@Column(name = "field_number", length = 11)
protected Integer fieldNumber;


@Column(name = "field_part", length = 5)
protected String fieldPart;


@Column(name = "page_number", length = 11)
protected Integer pageNumber;


@Column(name = "min_occurs", length = 11, nullable = false)
protected Integer minOccurs;


@Column(name = "max_occurs", length = 11)
protected Integer maxOccurs;


@Column(name = "required", nullable = false)
protected Boolean required = false;


@Column(name = "sort_weight")
protected Float sortWeight;

// Constructors
Expand Down
1 change: 0 additions & 1 deletion api/src/main/resources/hibernate.cfg.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
<mapping resource="org/openmrs/api/db/hibernate/DiagnosisAttributeType.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/FieldType.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/Form.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/FormField.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/GlobalProperty.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/Obs.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/Person.hbm.xml" />
Expand Down
79 changes: 0 additions & 79 deletions api/src/main/resources/org/openmrs/api/db/hibernate/FormField.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 @@ -44,6 +44,7 @@
import org.openmrs.DrugOrder;
import org.openmrs.Encounter;
import org.openmrs.EncounterRole;
import org.openmrs.FormField;
import org.openmrs.FreeTextDosingInstructions;
import org.openmrs.GlobalProperty;
import org.openmrs.Location;
Expand Down Expand Up @@ -2915,6 +2916,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
.addAnnotatedClass(ConceptClass.class)
.addAnnotatedClass(ConceptMap.class)
.addAnnotatedClass(FormResource.class)
.addAnnotatedClass(FormField.class)
.addAnnotatedClass(VisitType.class)
.addAnnotatedClass(ProviderRole.class)
.addAnnotatedClass(EncounterRole.class)
Expand Down
Loading