4743

pending completion

Build # 4743

Build Type

push

travis-ci

Committed by

dkayiwa

Commit Message

TRUNK-5019 Fixing error obsSave scenario of newChildObs not saving with entire obsTree edited

(cherry picked from commit c0f87ef0b)

Run Details

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

18109 of 32525 relevant lines covered (55.68%)

0.56 hits per line

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

69.05

/api/src/main/java/org/openmrs/Field.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 org.codehaus.jackson.annotate.JsonIgnore;

import java.util.HashSet;
import java.util.Set;

/**
 * Field
 *
 * @version 1.0
 */
public class Field extends BaseOpenmrsMetadata {
        
        public static final long serialVersionUID = 4454L;
        
        // Fields
        
        private Integer fieldId;
        
        private FieldType fieldType;
        
        private Concept concept;
        
        private String tableName;
        
        private String attributeName;
        
        private String defaultValue;
        
        private Boolean selectMultiple = false;
        
        private Set<FieldAnswer> answers;
        
        // Constructors
        
        /** default constructor */
        public Field() {
        }
        
        /** constructor with id */
        public Field(Integer fieldId) {
                this.fieldId = fieldId;
        }
        
        // Property accessors
        
        /**
         * @return Returns the fieldId.
         */
        public Integer getFieldId() {
                return fieldId;
        }
        
        /**
         * @param fieldId The fieldId to set.
         */
        public void setFieldId(Integer fieldId) {
                this.fieldId = fieldId;
        }
        
        /**
         * @return Returns the fieldType.
         */
        public FieldType getFieldType() {
                return fieldType;
        }
        
        /**
         * @param fieldType The fieldType to set.
         */
        public void setFieldType(FieldType fieldType) {
                this.fieldType = fieldType;
        }
        
        /**
         * @return Returns the concept.
         */
        public Concept getConcept() {
                return concept;
        }
        
        /**
         * @param concept The concept to set.
         */
        public void setConcept(Concept concept) {
                this.concept = concept;
        }
        
        /**
         * @return Returns the tableName.
         */
        public String getTableName() {
                return tableName;
        }
        
        /**
         * @param tableName The tableName to set.
         */
        public void setTableName(String tableName) {
                this.tableName = tableName;
        }
        
        /**
         * @return Returns the attributeName.
         */
        public String getAttributeName() {
                return attributeName;
        }
        
        /**
         * @param attributeName The attributeName to set.
         */
        public void setAttributeName(String attributeName) {
                // this.dirty = true;
                this.attributeName = attributeName;
        }
        
        /**
         * @return Returns the default value.
         */
        public String getDefaultValue() {
                return defaultValue;
        }
        
        /**
         * @param defaultValue The defaultValue to set.
         */
        public void setDefaultValue(String defaultValue) {
                this.defaultValue = defaultValue;
        }
        
        /**
         * @deprecated as of 2.0, use {@link #getSelectMultiple()}
         */
        @Deprecated
        @JsonIgnore
        public Boolean isSelectMultiple() {
                return getSelectMultiple();
        }
        
        /**
         * @return Returns the selectMultiple.
         */
        public Boolean getSelectMultiple() {
                return selectMultiple;
        }
        
        /**
         * @param selectMultiple The selectMultiple to set.
         */
        public void setSelectMultiple(Boolean selectMultiple) {
                this.selectMultiple = selectMultiple;
        }
        
        /**
         * @return Returns the fieldAnswers.
         */
        public Set<FieldAnswer> getAnswers() {
                return answers;
        }
        
        /**
         * @param fieldAnswers The fieldAnswers to set.
         */
        public void setAnswers(Set<FieldAnswer> fieldAnswers) {
                this.answers = fieldAnswers;
        }
        
        /**
         * Adds a field answer to the list of field answers
         *
         * @param fieldAnswer FieldAnswer to be added
         */
        public void addAnswer(FieldAnswer fieldAnswer) {
                if (answers == null) {
                        answers = new HashSet<FieldAnswer>();
                }
                if (!answers.contains(fieldAnswer) && fieldAnswer != null) {
                        answers.add(fieldAnswer);
                }
        }
        
        /**
         * Removes a field answer from the list of field answers
         *
         * @param fieldAnswer FieldAnswer to be removed
         */
        public void removeAnswer(FieldAnswer fieldAnswer) {
                if (answers != null) {
                        answers.remove(fieldAnswer);
                }
        }
        
        /**
         * @since 1.5
         * @see org.openmrs.OpenmrsObject#getId()
         */
        public Integer getId() {
                
                return getFieldId();
        }
        
        /**
         * @since 1.5
         * @see org.openmrs.OpenmrsObject#setId(java.lang.Integer)
         */
        public void setId(Integer id) {
                setFieldId(id);
                
        }
        
}

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 org.codehaus.jackson.annotate.JsonIgnore;
13
14	import java.util.HashSet;
15	import java.util.Set;
16
17	/**
18	* Field
19	*
20	* @version 1.0
21	*/
22	public class Field extends BaseOpenmrsMetadata {
23
24	public static final long serialVersionUID = 4454L;
25
26	// Fields
27
28	private Integer fieldId;
29
30	private FieldType fieldType;
31
32	private Concept concept;
33
34	private String tableName;
35
36	private String attributeName;
37
38	private String defaultValue;
39
40	private Boolean selectMultiple = false;	1✔
41
42	private Set<FieldAnswer> answers;
43
44	// Constructors
45
46	/** default constructor */
47	public Field() {	1✔
48	}	1✔
49
50	/** constructor with id */
51	public Field(Integer fieldId) {	1✔
52	this.fieldId = fieldId;	1✔
53	}	1✔
54
55	// Property accessors
56
57	/**
58	* @return Returns the fieldId.
59	*/
60	public Integer getFieldId() {
61	return fieldId;	1✔
62	}
63
64	/**
65	* @param fieldId The fieldId to set.
66	*/
67	public void setFieldId(Integer fieldId) {
68	this.fieldId = fieldId;	1✔
69	}	1✔
70
71	/**
72	* @return Returns the fieldType.
73	*/
74	public FieldType getFieldType() {
75	return fieldType;	1✔
76	}
77
78	/**
79	* @param fieldType The fieldType to set.
80	*/
81	public void setFieldType(FieldType fieldType) {
82	this.fieldType = fieldType;	1✔
83	}	1✔
84
85	/**
86	* @return Returns the concept.
87	*/
88	public Concept getConcept() {
89	return concept;	1✔
90	}
91
92	/**
93	* @param concept The concept to set.
94	*/
95	public void setConcept(Concept concept) {
96	this.concept = concept;	1✔
97	}	1✔
98
99	/**
100	* @return Returns the tableName.
101	*/
102	public String getTableName() {
103	return tableName;	1✔
104	}
105
106	/**
107	* @param tableName The tableName to set.
108	*/
109	public void setTableName(String tableName) {
110	this.tableName = tableName;	1✔
111	}	1✔
112
113	/**
114	* @return Returns the attributeName.
115	*/
116	public String getAttributeName() {
117	return attributeName;	1✔
118	}
119
120	/**
121	* @param attributeName The attributeName to set.
122	*/
123	public void setAttributeName(String attributeName) {
124	// this.dirty = true;
125	this.attributeName = attributeName;	1✔
126	}	1✔
127
128	/**
129	* @return Returns the default value.
130	*/
131	public String getDefaultValue() {
132	return defaultValue;	1✔
133	}
134
135	/**
136	* @param defaultValue The defaultValue to set.
137	*/
138	public void setDefaultValue(String defaultValue) {
139	this.defaultValue = defaultValue;	1✔
140	}	1✔
141
142	/**
143	* @deprecated as of 2.0, use {@link #getSelectMultiple()}
144	*/
145	@Deprecated
146	@JsonIgnore
147	public Boolean isSelectMultiple() {
148	return getSelectMultiple();	×
149	}
150
151	/**
152	* @return Returns the selectMultiple.
153	*/
154	public Boolean getSelectMultiple() {
155	return selectMultiple;	1✔
156	}
157
158	/**
159	* @param selectMultiple The selectMultiple to set.
160	*/
161	public void setSelectMultiple(Boolean selectMultiple) {
162	this.selectMultiple = selectMultiple;	1✔
163	}	1✔
164
165	/**
166	* @return Returns the fieldAnswers.
167	*/
168	public Set<FieldAnswer> getAnswers() {
169	return answers;	1✔
170	}
171
172	/**
173	* @param fieldAnswers The fieldAnswers to set.
174	*/
175	public void setAnswers(Set<FieldAnswer> fieldAnswers) {
176	this.answers = fieldAnswers;	×
177	}	×
178
179	/**
180	* Adds a field answer to the list of field answers
181	*
182	* @param fieldAnswer FieldAnswer to be added
183	*/
184	public void addAnswer(FieldAnswer fieldAnswer) {
185	if (answers == null) {	×
186	answers = new HashSet<FieldAnswer>();	×
187	}
188	if (!answers.contains(fieldAnswer) && fieldAnswer != null) {	×
189	answers.add(fieldAnswer);	×
190	}
191	}	×
192
193	/**
194	* Removes a field answer from the list of field answers
195	*
196	* @param fieldAnswer FieldAnswer to be removed
197	*/
198	public void removeAnswer(FieldAnswer fieldAnswer) {
199	if (answers != null) {	×
200	answers.remove(fieldAnswer);	×
201	}
202	}	×
203
204	/**
205	* @since 1.5
206	* @see org.openmrs.OpenmrsObject#getId()
207	*/
208	public Integer getId() {
209
210	return getFieldId();	1✔
211	}
212
213	/**
214	* @since 1.5
215	* @see org.openmrs.OpenmrsObject#setId(java.lang.Integer)
216	*/
217	public void setId(Integer id) {
218	setFieldId(id);	×
219
220	}	×
221
222	}

openmrs / openmrs-core / 4743

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