Skip to content

TRUNK-5951: SerializedObject Domain - Switching from Hibernate Mappings to Annotations #4531

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

Merged
dkayiwa merged 1 commit into from
Jan 16, 2024
+30 −61
Merged

TRUNK-5951: SerializedObject Domain - Switching from Hibernate Mappings to Annotations #4531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 28 additions & 5 deletions api/src/main/java/org/openmrs/api/db/SerializedObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,45 @@
*/
package org.openmrs.api.db;

import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.Parameter;
import org.openmrs.BaseChangeableOpenmrsMetadata;
import org.openmrs.serialization.OpenmrsSerializer;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;

/**
* Object representation of a Serialized Object as stored in the database.
*/
@Entity
@Table(name = "serialized_object")
public class SerializedObject extends BaseChangeableOpenmrsMetadata {


@Id
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "serialized_object_id_seq")
@GenericGenerator(
name = "serialized_object_id_seq",
strategy = "native",
parameters = @Parameter(name = "sequence", value = "serialized_object_serialized_object_id_seq")
)
@Column(name = "serialized_object_id")
private Integer id;


@Column(name = "type", nullable = false, length = 255)
private String type;


@Column(name = "subtype", nullable = false, length = 255)
private String subtype;


@Column(name = "serialization_class", nullable = false, length = 255)
private Class<? extends OpenmrsSerializer> serializationClass;


@Column(name = "serialized_data", length = 16777215)
private String serializedData;

/**
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 @@ -90,7 +90,6 @@
<mapping resource="org/openmrs/api/db/hibernate/PatientState.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/Cohort.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/CohortMembership.hbm.xml"/>
<mapping resource="org/openmrs/api/db/hibernate/SerializedObject.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/OrderFrequency.hbm.xml" />

<!-- HL7 -->
Expand Down
55 changes: 0 additions & 55 deletions api/src/main/resources/org/openmrs/api/db/hibernate/SerializedObject.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 @@ -63,6 +63,7 @@
import org.openmrs.api.builder.DrugOrderBuilder;
import org.openmrs.api.builder.OrderBuilder;
import org.openmrs.api.context.Context;
import org.openmrs.api.db.SerializedObject;
import org.openmrs.api.db.hibernate.HibernateAdministrationDAO;
import org.openmrs.api.db.hibernate.HibernateSessionFactoryBean;
import org.openmrs.api.impl.OrderServiceImpl;
Expand Down Expand Up @@ -2660,6 +2661,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
.addAnnotatedClass(PersonAttributeType.class)
.addAnnotatedClass(User.class)
.addAnnotatedClass(LocationAttributeType.class)
.addAnnotatedClass(SerializedObject.class)
.getMetadataBuilder().build();


Expand Down