9449810392

Committed 10 Jun 2024 02:04PM UTC coverage: 63.671% (-0.008%) from 63.679%

Build # 9449810392

Build Type

push

github

Committed by

ibacher

Commit Message

Revert "TRUNK-6242: editing the hydrate() to fetch concepts by id/Uuid/mappings by replacing ConceptService#getConcept() with  ConceptService#getConceptByReference() (#4660)"

This reverts commit 87b52cd5d.

Run Details

1 of 1 new or added line in 1 file covered. (100.0%)

6 existing lines in 4 files now uncovered.

21662 of 34022 relevant lines covered (63.67%)

0.64 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

93.33

/api/src/main/java/org/openmrs/ConceptNameTag.java

/**
 * This Source Code Form is subject to the terms of the Mozilla Public License,
 * v. 2.0. If a copy of the MPL was not distributed with this file, You can
 * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
 * the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
 *
 * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
 * graphic logo is a trademark of OpenMRS Inc.
 */
package org.openmrs;

import java.util.Date;

import org.codehaus.jackson.annotate.JsonIgnore;

/**
 * ConceptNameTag is a textual tag which can be applied to a ConceptName.
 */
public class ConceptNameTag extends BaseOpenmrsObject implements Auditable, Voidable, java.io.Serializable {
        
        public static final long serialVersionUID = 33226787L;
        
        // Fields
        private Integer conceptNameTagId;
        
        private String tag;
        
        private String description;
        
        private User creator;
        
        private Date dateCreated;
        
        private Boolean voided = false;
        
        private User voidedBy;
        
        private Date dateVoided;
        
        private String voidReason;
        
        private User changedBy;
        
        private Date dateChanged;
        
        // Constructors
        
        /**
         * Default constructor.
         */
        public ConceptNameTag() {
        }
        
        /**
         * Public constructor. Use factory methods to obtain copies of the desired tags.
         * 
         * @param tag
         * @param description
         */
        public ConceptNameTag(String tag, String description) {
                setTag(tag);
                setDescription(description);
        }
        
        // Property accessors
        
        /**
         * Returns the textual representation of this ConceptNameTag.
         * 
         * @return the textual representation of this ConceptNameTag.
         */
        public String getTag() {
                return tag;
        }
        
        /**
         * Sets the textual representation of this ConceptNametag.
         * 
         * @param tag the textual representation
         */
        public void setTag(String tag) {
                this.tag = tag;
        }
        
        /**
         * Returns the description of this tag.
         * 
         * @return the description of this tag
         */
        public String getDescription() {
                return description;
        }
        
        /**
         * Sets the description of this tag.
         * 
         * @param description
         */
        public void setDescription(String description) {
                this.description = description;
        }
        
        /**
         * @return Returns the creator.
         */
        @Override
        public User getCreator() {
                return creator;
        }
        
        /**
         * @param creator The creator to set.
         */
        @Override
        public void setCreator(User creator) {
                this.creator = creator;
        }
        
        /**
         * @return Returns the dateCreated.
         */
        @Override
        public Date getDateCreated() {
                return dateCreated;
        }
        
        /**
         * @param dateCreated The dateCreated to set.
         */
        @Override
        public void setDateCreated(Date dateCreated) {
                this.dateCreated = dateCreated;
        }
        
        /**
         * Returns whether the ConceptName has been voided.
         * 
         * @return true if the ConceptName has been voided, false otherwise.
         * 
         * @deprecated as of 2.0, use {@link #getVoided()}
         */
        @Override
        @Deprecated
        @JsonIgnore
        public Boolean isVoided() {
                return getVoided();
        }
        
        /**
         * Returns whether the ConceptName has been voided.
         * 
         * @return true if the ConceptName has been voided, false otherwise.
         */
        @Override
        public Boolean getVoided() {
                return voided;
        }
        
        /**
         * Sets the voided status of the ConceptName.
         * 
         * @param voided the voided status to set.
         */
        @Override
        public void setVoided(Boolean voided) {
                this.voided = voided;
        }
        
        /**
         * Returns the User who voided this ConceptName.
         * 
         * @return the User who voided this ConceptName, or null if not set
         */
        @Override
        public User getVoidedBy() {
                return voidedBy;
        }
        
        /**
         * Sets the User who voided this ConceptName.
         * 
         * @param voidedBy the user who voided this ConceptName.
         */
        @Override
        public void setVoidedBy(User voidedBy) {
                this.voidedBy = voidedBy;
        }
        
        /**
         * Returns the Date this ConceptName was voided.
         * 
         * @return the Date this ConceptName was voided.
         */
        @Override
        public Date getDateVoided() {
                return dateVoided;
        }
        
        /**
         * Sets the Data this ConceptName was voided.
         * 
         * @param dateVoided the date the ConceptName was voided.
         */
        @Override
        public void setDateVoided(Date dateVoided) {
                this.dateVoided = dateVoided;
        }
        
        /**
         * Returns the reason this ConceptName was voided.
         * 
         * @return the reason this ConceptName was voided
         */
        @Override
        public String getVoidReason() {
                return voidReason;
        }
        
        /**
         * Sets the reason this ConceptName was voided.
         * 
         * @param voidReason the reason this ConceptName was voided
         */
        @Override
        public void setVoidReason(String voidReason) {
                this.voidReason = voidReason;
        }
        
        @Override
        public String toString() {
                return this.tag;
        }
        
        /**
         * @return the conceptNameTagId
         */
        public Integer getConceptNameTagId() {
                return conceptNameTagId;
        }
        
        /**
         * @param conceptNameTagId the conceptNameTagId to set
         */
        public void setConceptNameTagId(Integer conceptNameTagId) {
                this.conceptNameTagId = conceptNameTagId;
        }
        
        /**
         * @since 1.5
         * @see org.openmrs.OpenmrsObject#getId()
         */
        @Override
        public Integer getId() {
                return getConceptNameTagId();
        }
        
        /**
         * @since 1.5
         * @see org.openmrs.OpenmrsObject#setId(java.lang.Integer)
         */
        @Override
        public void setId(Integer id) {
                setConceptNameTagId(id);
        }
        
        /**
         * @return Returns the changedBy.
         */
        @Override
        public User getChangedBy() {
                return changedBy;
        }
        
        /**
         * @param changedBy The user that changed this object
         */
        @Override
        public void setChangedBy(User changedBy) {
                this.changedBy = changedBy;
        }
        
        /**
         * @return Returns the date this object was changed
         */
        @Override
        public Date getDateChanged() {
                return dateChanged;
        }
        
        /**
         * @param dateChanged The date this object was changed
         */
        @Override
        public void setDateChanged(Date dateChanged) {
                this.dateChanged = dateChanged;
        }
}

1	/**
2	* This Source Code Form is subject to the terms of the Mozilla Public License,
3	* v. 2.0. If a copy of the MPL was not distributed with this file, You can
4	* obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
5	* the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
6	*
7	* Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
8	* graphic logo is a trademark of OpenMRS Inc.
9	*/
10	package org.openmrs;
11
12	import java.util.Date;
13
14	import org.codehaus.jackson.annotate.JsonIgnore;
15
16	/**
17	* ConceptNameTag is a textual tag which can be applied to a ConceptName.
18	*/
19	public class ConceptNameTag extends BaseOpenmrsObject implements Auditable, Voidable, java.io.Serializable {
20
21	public static final long serialVersionUID = 33226787L;
22
23	// Fields
24	private Integer conceptNameTagId;
25
26	private String tag;
27
28	private String description;
29
30	private User creator;
31
32	private Date dateCreated;
33
34	private Boolean voided = false;	1✔
35
36	private User voidedBy;
37
38	private Date dateVoided;
39
40	private String voidReason;
41
42	private User changedBy;
43
44	private Date dateChanged;
45
46	// Constructors
47
48	/**
49	* Default constructor.
50	*/
51	public ConceptNameTag() {	1✔
52	}	1✔
53
54	/**
55	* Public constructor. Use factory methods to obtain copies of the desired tags.
56	*
57	* @param tag
58	* @param description
59	*/
60	public ConceptNameTag(String tag, String description) {	1✔
61	setTag(tag);	1✔
62	setDescription(description);	1✔
63	}	1✔
64
65	// Property accessors
66
67	/**
68	* Returns the textual representation of this ConceptNameTag.
69	*
70	* @return the textual representation of this ConceptNameTag.
71	*/
72	public String getTag() {
73	return tag;	1✔
74	}
75
76	/**
77	* Sets the textual representation of this ConceptNametag.
78	*
79	* @param tag the textual representation
80	*/
81	public void setTag(String tag) {
82	this.tag = tag;	1✔
83	}	1✔
84
85	/**
86	* Returns the description of this tag.
87	*
88	* @return the description of this tag
89	*/
90	public String getDescription() {
91	return description;	1✔
92	}
93
94	/**
95	* Sets the description of this tag.
96	*
97	* @param description
98	*/
99	public void setDescription(String description) {
100	this.description = description;	1✔
101	}	1✔
102
103	/**
104	* @return Returns the creator.
105	*/
106	@Override
107	public User getCreator() {
108	return creator;	1✔
109	}
110
111	/**
112	* @param creator The creator to set.
113	*/
114	@Override
115	public void setCreator(User creator) {
116	this.creator = creator;	1✔
117	}	1✔
118
119	/**
120	* @return Returns the dateCreated.
121	*/
122	@Override
123	public Date getDateCreated() {
124	return dateCreated;	1✔
125	}
126
127	/**
128	* @param dateCreated The dateCreated to set.
129	*/
130	@Override
131	public void setDateCreated(Date dateCreated) {
132	this.dateCreated = dateCreated;	1✔
133	}	1✔
134
135	/**
136	* Returns whether the ConceptName has been voided.
137	*
138	* @return true if the ConceptName has been voided, false otherwise.
139	*
140	* @deprecated as of 2.0, use {@link #getVoided()}
141	*/
142	@Override
143	@Deprecated
144	@JsonIgnore
145	public Boolean isVoided() {
UNCOV 146	return getVoided();	×
147	}
148
149	/**
150	* Returns whether the ConceptName has been voided.
151	*
152	* @return true if the ConceptName has been voided, false otherwise.
153	*/
154	@Override
155	public Boolean getVoided() {
156	return voided;	1✔
157	}
158
159	/**
160	* Sets the voided status of the ConceptName.
161	*
162	* @param voided the voided status to set.
163	*/
164	@Override
165	public void setVoided(Boolean voided) {
166	this.voided = voided;	1✔
167	}	1✔
168
169	/**
170	* Returns the User who voided this ConceptName.
171	*
172	* @return the User who voided this ConceptName, or null if not set
173	*/
174	@Override
175	public User getVoidedBy() {
176	return voidedBy;	1✔
177	}
178
179	/**
180	* Sets the User who voided this ConceptName.
181	*
182	* @param voidedBy the user who voided this ConceptName.
183	*/
184	@Override
185	public void setVoidedBy(User voidedBy) {
186	this.voidedBy = voidedBy;	1✔
187	}	1✔
188
189	/**
190	* Returns the Date this ConceptName was voided.
191	*
192	* @return the Date this ConceptName was voided.
193	*/
194	@Override
195	public Date getDateVoided() {
196	return dateVoided;	1✔
197	}
198
199	/**
200	* Sets the Data this ConceptName was voided.
201	*
202	* @param dateVoided the date the ConceptName was voided.
203	*/
204	@Override
205	public void setDateVoided(Date dateVoided) {
206	this.dateVoided = dateVoided;	1✔
207	}	1✔
208
209	/**
210	* Returns the reason this ConceptName was voided.
211	*
212	* @return the reason this ConceptName was voided
213	*/
214	@Override
215	public String getVoidReason() {
216	return voidReason;	1✔
217	}
218
219	/**
220	* Sets the reason this ConceptName was voided.
221	*
222	* @param voidReason the reason this ConceptName was voided
223	*/
224	@Override
225	public void setVoidReason(String voidReason) {
226	this.voidReason = voidReason;	1✔
227	}	1✔
228
229	@Override
230	public String toString() {
231	return this.tag;	1✔
232	}
233
234	/**
235	* @return the conceptNameTagId
236	*/
237	public Integer getConceptNameTagId() {
238	return conceptNameTagId;	1✔
239	}
240
241	/**
242	* @param conceptNameTagId the conceptNameTagId to set
243	*/
244	public void setConceptNameTagId(Integer conceptNameTagId) {
245	this.conceptNameTagId = conceptNameTagId;	1✔
246	}	1✔
247
248	/**
249	* @since 1.5
250	* @see org.openmrs.OpenmrsObject#getId()
251	*/
252	@Override
253	public Integer getId() {
254	return getConceptNameTagId();	1✔
255	}
256
257	/**
258	* @since 1.5
259	* @see org.openmrs.OpenmrsObject#setId(java.lang.Integer)
260	*/
261	@Override
262	public void setId(Integer id) {
263	setConceptNameTagId(id);	×
264	}	×
265
266	/**
267	* @return Returns the changedBy.
268	*/
269	@Override
270	public User getChangedBy() {
271	return changedBy;	1✔
272	}
273
274	/**
275	* @param changedBy The user that changed this object
276	*/
277	@Override
278	public void setChangedBy(User changedBy) {
279	this.changedBy = changedBy;	1✔
280	}	1✔
281
282	/**
283	* @return Returns the date this object was changed
284	*/
285	@Override
286	public Date getDateChanged() {
287	return dateChanged;	1✔
288	}
289
290	/**
291	* @param dateChanged The date this object was changed
292	*/
293	@Override
294	public void setDateChanged(Date dateChanged) {
295	this.dateChanged = dateChanged;	1✔
296	}	1✔
297	}

openmrs / openmrs-core / 9449810392

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous