Skip to content
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

TRUNK-5918 : Switching from Hibernate Mappings to Annotations for ConceptName Domain #4879

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+58 −68
Open

TRUNK-5918 : Switching from Hibernate Mappings to Annotations for ConceptName Domain #4879

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bf1363
TRUNK-5918 Switching from Hibernate Mappings to Annotations for Conce…
UNCANNY69 Dec 27, 2024
4052954
TRUNK-5918 Switching from Hibernate Mappings to Annotations for Conce…
UNCANNY69 Dec 28, 2024
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
61 changes: 60 additions & 1 deletion api/src/main/java/org/openmrs/ConceptName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,20 @@
*/
package org.openmrs;

import javax.persistence.AttributeOverride;
import javax.persistence.AttributeOverrides;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
Expand All @@ -20,6 +34,11 @@
import org.apache.lucene.analysis.standard.StandardFilterFactory;
import org.apache.lucene.analysis.standard.StandardTokenizerFactory;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.hibernate.annotations.BatchSize;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.annotations.Parameter;
import org.hibernate.annotations.Type;
import org.hibernate.envers.Audited;
import org.hibernate.search.annotations.Analyze;
import org.hibernate.search.annotations.Analyzer;
Expand All @@ -38,6 +57,9 @@
* ConceptName is the real world term used to express a Concept within the idiom of a particular
* locale.
*/
@Entity
@Table(name = "concept_name")
@BatchSize(size = 25)
@Indexed
@AnalyzerDef(
name = "ConceptNameAnalyzer", tokenizer = @TokenizerDef(factory = StandardTokenizerFactory.class), filters = {
Expand All @@ -46,48 +68,85 @@
@TokenFilterDef(factory = ASCIIFoldingFilterFactory.class)
})
@Analyzer(definition = "ConceptNameAnalyzer")
@AttributeOverrides(value = {
@AttributeOverride(
name = "uuid",
column = @Column(name = "uuid", length = 38, unique = true)
)
})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
@AttributeOverrides(value = {
@AttributeOverride(
name = "uuid",
column = @Column(name = "uuid", length = 38, unique = true)
)
})
@AttributeOverrides({
@AttributeOverride(name = "uuid", column = @Column(name = "uuid", length = 38, unique = true))
})

@Audited
public class ConceptName extends BaseOpenmrsObject implements Auditable, Voidable, java.io.Serializable {

public static final long serialVersionUID = 2L;

@Id
@Column(name = "concept_name_id")
@GeneratedValue(strategy = GenerationType.IDENTITY)
@DocumentId
private Integer conceptNameId;

UNCANNY69 marked this conversation as resolved.
Show resolved Hide resolved
@ManyToOne
@JoinColumn(name = "concept_id",nullable = false)
@IndexedEmbedded(includeEmbeddedObjectId = true)
private Concept concept;

@Field
@Column(name = "name",nullable = false)
private String name;

@Field(analyze = Analyze.NO)
@FieldBridge(impl = LocaleFieldBridge.class)
@Column(name = "locale", nullable = false, length = 50)
// ABK: upgraded from a plain string to a full locale object
private Locale locale;

@ManyToOne
@JoinColumn(name = "creator", nullable = false)
private User creator;

@Column(name="date_created", nullable = false)
private Date dateCreated;

@Field
@Column(name="voided", nullable = false, length = 1)
private Boolean voided = false;

@ManyToOne
@JoinColumn(name = "voided_by")
private User voidedBy;

@Column(name = "date_voided", length = 19)
private Date dateVoided;

@Column(name = "void_reason")
private String voidReason;

@ManyToMany
@JoinTable(
name = "concept_name_tag_map",
joinColumns = @JoinColumn(name = "concept_name_id"),
inverseJoinColumns = @JoinColumn(name = "concept_name_tag_id")
)
@Cascade(CascadeType.SAVE_UPDATE)
private Collection<ConceptNameTag> tags;

@Field
@Enumerated(EnumType.STRING)
@Column(name = "concept_name_type", length = 50)
@Type(type = "org.hibernate.type.EnumType", parameters = {
@Parameter(name = "enumClass", value = "org.openmrs.api.ConceptNameType"),
@Parameter(name = "useNamed", value = "true")
})
private ConceptNameType conceptNameType;

@Field
@Column(name = "locale_preferred", nullable = false, length = 1)
private Boolean localePreferred = false;

@ManyToOne
@JoinColumn(name = "changed_by")
private User changedBy;

@Column(name = "date_changed", length = 19)
private Date dateChanged;

// 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 @@ -28,7 +28,6 @@
<mapping resource="org/openmrs/api/db/hibernate/ConceptAttribute.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/ConceptAttributeType.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/ConceptDescription.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/ConceptName.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/ConceptNameTag.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/ConceptClass.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/ConceptDatatype.hbm.xml" />
Expand Down
67 changes: 0 additions & 67 deletions api/src/main/resources/org/openmrs/api/db/hibernate/ConceptName.hbm.xml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 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 @@ -2736,6 +2736,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
.addAnnotatedClass(PatientState.class)
.addAnnotatedClass(DrugIngredient.class)
.addAnnotatedClass(AlertRecipient.class)
.addAnnotatedClass(ConceptName.class)
.addAnnotatedClass(PatientIdentifierType.class)
.addAnnotatedClass(ProgramAttributeType.class)
.addAnnotatedClass(HL7InError.class)
Expand Down