### Eclipse Workspace Patch 1.0 #P org.openmrs-1.9 Index: api/src/test/java/org/openmrs/BaseCustomizableMetadataTest.java =================================================================== --- api/src/test/java/org/openmrs/BaseCustomizableMetadataTest.java (revision 24282) +++ api/src/test/java/org/openmrs/BaseCustomizableMetadataTest.java (working copy) @@ -62,7 +62,7 @@ throws Exception { ProviderAttribute providerAttribute = new ProviderAttribute(); providerAttribute.setAttributeType(providerAttributeType); - providerAttribute.setValueReference(value.toString()); + providerAttribute.setValueReferenceInternal(value.toString()); return providerAttribute; } } Index: api/src/main/java/org/openmrs/api/db/hibernate/HibernateProviderDAO.java =================================================================== --- api/src/main/java/org/openmrs/api/db/hibernate/HibernateProviderDAO.java (revision 24282) +++ api/src/main/java/org/openmrs/api/db/hibernate/HibernateProviderDAO.java (working copy) @@ -35,6 +35,8 @@ import org.openmrs.ProviderAttributeType; import org.openmrs.api.db.DAOException; import org.openmrs.api.db.ProviderDAO; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; /** * Hibernate specific Provider related functions. This class should not be used directly. All calls Index: api/src/main/java/org/openmrs/aop/RequiredDataAdvice.java =================================================================== --- api/src/main/java/org/openmrs/aop/RequiredDataAdvice.java (revision 24282) +++ api/src/main/java/org/openmrs/aop/RequiredDataAdvice.java (working copy) @@ -37,6 +37,7 @@ import org.openmrs.api.handler.VoidHandler; import org.openmrs.util.HandlerUtil; import org.openmrs.util.Reflect; +import org.openmrs.validator.ValidateUtil; import org.springframework.aop.MethodBeforeAdvice; import org.springframework.util.StringUtils; @@ -127,6 +128,8 @@ if (args.length > 1 && args[1] instanceof String) other = (String) args[1]; + Context.getAdministrationService().validateInManualFlushMode(mainArgument); + recursivelyHandle(SaveHandler.class, (OpenmrsObject) mainArgument, other); } // if the first argument is a list of openmrs objects, handle them all now @@ -140,11 +143,12 @@ Collection openmrsObjects = (Collection) mainArgument; for (OpenmrsObject object : openmrsObjects) { + Context.getAdministrationService().validateInManualFlushMode(mainArgument); + recursivelyHandle(SaveHandler.class, object, other); } } - } else if (methodName.startsWith("void")) { Voidable voidable = (Voidable) args[0]; String voidReason = (String) args[1]; Index: api/src/main/java/org/openmrs/api/VisitService.java =================================================================== --- api/src/main/java/org/openmrs/api/VisitService.java (revision 24282) +++ api/src/main/java/org/openmrs/api/VisitService.java (working copy) @@ -34,7 +34,6 @@ * * @since 1.9 */ -@Transactional public interface VisitService extends OpenmrsService { /** @@ -43,7 +42,6 @@ * @return a list of visit type objects. * @should get all visit types */ - @Transactional(readOnly = true) @Authorized( { PrivilegeConstants.VIEW_VISIT_TYPES }) List getAllVisitTypes(); @@ -54,7 +52,6 @@ * @return the visit type object found with the given id, else null. * @should get correct visit type */ - @Transactional(readOnly = true) @Authorized( { PrivilegeConstants.VIEW_VISIT_TYPES }) VisitType getVisitType(Integer visitTypeId); @@ -65,7 +62,6 @@ * @return the visit type object found with the given uuid, else null. * @should get correct visit type */ - @Transactional(readOnly = true) @Authorized( { PrivilegeConstants.VIEW_VISIT_TYPES }) VisitType getVisitTypeByUuid(String uuid); @@ -76,7 +72,6 @@ * @return a list of all visit types with names similar to or containing the given phrase * @should get correct visit types */ - @Transactional(readOnly = true) @Authorized( { PrivilegeConstants.VIEW_VISIT_TYPES }) List getVisitTypes(String fuzzySearchPhrase); @@ -130,7 +125,6 @@ * @throws APIException * @should return all unvoided visits */ - @Transactional(readOnly = true) @Authorized(PrivilegeConstants.VIEW_VISITS) public List getAllVisits() throws APIException; @@ -141,7 +135,6 @@ * @return the visit object found with the given id, else null. * @throws APIException */ - @Transactional(readOnly = true) @Authorized(PrivilegeConstants.VIEW_VISITS) public Visit getVisit(Integer visitId) throws APIException; @@ -153,7 +146,6 @@ * @throws APIException * @should return a visit matching the specified uuid */ - @Transactional(readOnly = true) @Authorized(PrivilegeConstants.VIEW_VISITS) public Visit getVisitByUuid(String uuid) throws APIException; @@ -245,7 +237,6 @@ * @should get all visits with given attribute values * @should not find any visits if none have given attribute values */ - @Transactional(readOnly = true) @Authorized(PrivilegeConstants.VIEW_VISITS) public List getVisits(Collection visitTypes, Collection patients, Collection locations, Collection indications, Date minStartDatetime, Date maxStartDatetime, @@ -260,7 +251,6 @@ * @throws APIException * @should return all unvoided visits for the specified patient */ - @Transactional(readOnly = true) @Authorized(PrivilegeConstants.VIEW_VISITS) public List getVisitsByPatient(Patient patient) throws APIException; @@ -271,7 +261,6 @@ * @return a list of visits * @throws APIException */ - @Transactional(readOnly = true) @Authorized(PrivilegeConstants.VIEW_VISITS) public List getActiveVisitsByPatient(Patient patient) throws APIException; @@ -287,7 +276,6 @@ * @should return all unvoided visits for the specified patient * @should return all active visits for the specified patient */ - @Transactional(readOnly = true) @Authorized(PrivilegeConstants.VIEW_VISITS) public List getVisitsByPatient(Patient patient, boolean includeInactive, boolean includeVoided) throws APIException; @@ -296,7 +284,6 @@ * @return all {@link VisitAttributeType}s * @should return all visit attribute types including retired ones */ - @Transactional(readOnly = true) @Authorized(PrivilegeConstants.VIEW_VISIT_ATTRIBUTE_TYPES) List getAllVisitAttributeTypes(); @@ -306,7 +293,6 @@ * @should return the visit attribute type with the given id * @should return null if no visit attribute type exists with the given id */ - @Transactional(readOnly = true) @Authorized(PrivilegeConstants.VIEW_VISIT_ATTRIBUTE_TYPES) VisitAttributeType getVisitAttributeType(Integer id); @@ -316,7 +302,6 @@ * @should return the visit attribute type with the given uuid * @should return null if no visit attribute type exists with the given uuid */ - @Transactional(readOnly = true) @Authorized(PrivilegeConstants.VIEW_VISIT_ATTRIBUTE_TYPES) VisitAttributeType getVisitAttributeTypeByUuid(String uuid); @@ -366,7 +351,6 @@ * @should get the visit attribute with the given uuid * @should return null if no visit attribute has the given uuid */ - @Transactional(readOnly = true) @Authorized(PrivilegeConstants.VIEW_VISITS) VisitAttribute getVisitAttributeByUuid(String uuid); Index: api/src/test/java/org/openmrs/api/LocationServiceTest.java =================================================================== --- api/src/test/java/org/openmrs/api/LocationServiceTest.java (revision 24282) +++ api/src/test/java/org/openmrs/api/LocationServiceTest.java (working copy) @@ -140,16 +140,19 @@ // First, create a new Location Location location = new Location(); location.setName("parent"); + location.setDescription("is the parent"); ls.saveLocation(location); // Now add a child location to it Location childA = new Location(); childA.setName("level A child"); + childA.setDescription("is a child"); location.addChildLocation(childA); // Add a new child location to the first child location Location childB = new Location(); childB.setName("level B child"); + childB.setDescription("is a child"); childA.addChildLocation(childB); ls.saveLocation(location); @@ -587,6 +590,7 @@ // First, create a new Location Location location = new Location(); location.setName("name"); + location.setDescription("is a location"); ls.saveLocation(location); // Create a tag @@ -623,6 +627,7 @@ // First, create a new Location Location location = new Location(); location.setName("name"); + location.setDescription("is a location"); // Add a transient tag with an existing name location.addTag(new LocationTag("General Hospital", null)); Index: api/src/main/java/org/openmrs/api/db/hibernate/HibernateVisitDAO.java =================================================================== --- api/src/main/java/org/openmrs/api/db/hibernate/HibernateVisitDAO.java (revision 24282) +++ api/src/main/java/org/openmrs/api/db/hibernate/HibernateVisitDAO.java (working copy) @@ -36,6 +36,8 @@ import org.openmrs.api.db.DAOException; import org.openmrs.api.db.VisitDAO; import org.openmrs.attribute.AttributeType; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; /** * Hibernate specific visit related functions This class should not be used directly. All calls @@ -59,6 +61,7 @@ * @see org.openmrs.api.db.VisitDAO#getAllVisitTypes() */ @SuppressWarnings("unchecked") + @Transactional(readOnly = true) public List getAllVisitTypes() throws APIException { return getCurrentSession().createCriteria(VisitType.class).list(); } @@ -66,6 +69,7 @@ /** * @see org.openmrs.api.db.VisitDAO#getVisitType(java.lang.Integer) */ + @Transactional(readOnly = true) public VisitType getVisitType(Integer visitTypeId) { return (VisitType) sessionFactory.getCurrentSession().get(VisitType.class, visitTypeId); } @@ -73,6 +77,7 @@ /** * @see org.openmrs.api.db.VisitDAO#getVisitTypeByUuid(java.lang.String) */ + @Transactional(readOnly = true) public VisitType getVisitTypeByUuid(String uuid) { return (VisitType) sessionFactory.getCurrentSession().createQuery("from VisitType vt where vt.uuid = :uuid") .setString("uuid", uuid).uniqueResult(); @@ -82,6 +87,7 @@ * @see org.openmrs.api.db.VisitDAO#getVisitTypes(java.lang.String) */ @SuppressWarnings("unchecked") + @Transactional(readOnly = true) public List getVisitTypes(String fuzzySearchPhrase) { Criteria criteria = sessionFactory.getCurrentSession().createCriteria(VisitType.class); criteria.add(Restrictions.ilike("name", fuzzySearchPhrase, MatchMode.ANYWHERE)); @@ -92,6 +98,7 @@ /** * @see org.openmrs.api.db.VisitDAO#saveVisitType(org.openmrs.VisitType) */ + @Transactional public VisitType saveVisitType(VisitType visitType) { sessionFactory.getCurrentSession().saveOrUpdate(visitType); return visitType; @@ -100,6 +107,7 @@ /** * @see org.openmrs.api.db.VisitDAO#purgeVisitType(org.openmrs.VisitType) */ + @Transactional public void purgeVisitType(VisitType visitType) { sessionFactory.getCurrentSession().delete(visitType); } @@ -108,6 +116,7 @@ * @see org.openmrs.api.db.VisitDAO#getVisit(java.lang.Integer) */ @Override + @Transactional(readOnly = true) public Visit getVisit(Integer visitId) throws DAOException { return (Visit) getCurrentSession().get(Visit.class, visitId); } @@ -116,6 +125,7 @@ * @see org.openmrs.api.db.VisitDAO#getVisitByUuid(java.lang.String) */ @Override + @Transactional(readOnly = true) public Visit getVisitByUuid(String uuid) throws DAOException { return (Visit) getCurrentSession().createQuery("from Visit v where v.uuid = :uuid").setString("uuid", uuid) .uniqueResult(); @@ -125,6 +135,7 @@ * @see org.openmrs.api.db.VisitDAO#saveVisit(org.openmrs.Visit) */ @Override + @Transactional public Visit saveVisit(Visit visit) throws DAOException { getCurrentSession().saveOrUpdate(visit); return visit; @@ -134,6 +145,7 @@ * @see org.openmrs.api.db.VisitDAO#deleteVisit(org.openmrs.Visit) */ @Override + @Transactional public void deleteVisit(Visit visit) throws DAOException { getCurrentSession().delete(visit); } @@ -143,6 +155,7 @@ */ @SuppressWarnings("unchecked") @Override + @Transactional(readOnly = true) public List getVisits(Collection visitTypes, Collection patients, Collection locations, Collection indications, Date minStartDatetime, Date maxStartDatetime, Date minEndDatetime, Date maxEndDatetime, final Map serializedAttributeValues, @@ -196,6 +209,7 @@ */ @SuppressWarnings("unchecked") @Override + @Transactional(readOnly = true) public List getAllVisitAttributeTypes() { return getCurrentSession().createCriteria(VisitAttributeType.class).list(); } @@ -204,6 +218,7 @@ * @see org.openmrs.api.db.VisitDAO#getVisitAttributeType(java.lang.Integer) */ @Override + @Transactional(readOnly = true) public VisitAttributeType getVisitAttributeType(Integer id) { return (VisitAttributeType) getCurrentSession().get(VisitAttributeType.class, id); } @@ -212,6 +227,7 @@ * @see org.openmrs.api.db.VisitDAO#getVisitAttributeTypeByUuid(java.lang.String) */ @Override + @Transactional(readOnly = true) public VisitAttributeType getVisitAttributeTypeByUuid(String uuid) { return (VisitAttributeType) getCurrentSession().createCriteria(VisitAttributeType.class).add( Restrictions.eq("uuid", uuid)).uniqueResult(); @@ -221,6 +237,7 @@ * @see org.openmrs.api.db.VisitDAO#saveVisitAttributeType(org.openmrs.VisitAttributeType) */ @Override + @Transactional public VisitAttributeType saveVisitAttributeType(VisitAttributeType visitAttributeType) { getCurrentSession().saveOrUpdate(visitAttributeType); return visitAttributeType; @@ -230,6 +247,7 @@ * @see org.openmrs.api.db.VisitDAO#deleteVisitAttributeType(org.openmrs.VisitAttributeType) */ @Override + @Transactional public void deleteVisitAttributeType(VisitAttributeType visitAttributeType) { getCurrentSession().delete(visitAttributeType); } @@ -238,6 +256,7 @@ * @see org.openmrs.api.db.VisitDAO#getVisitAttributeByUuid(java.lang.String) */ @Override + @Transactional(readOnly = true) public VisitAttribute getVisitAttributeByUuid(String uuid) { return (VisitAttribute) getCurrentSession().createCriteria(VisitAttribute.class).add(Restrictions.eq("uuid", uuid)) .uniqueResult(); Index: api/src/main/java/org/openmrs/attribute/BaseAttribute.java =================================================================== --- api/src/main/java/org/openmrs/attribute/BaseAttribute.java (revision 24282) +++ api/src/main/java/org/openmrs/attribute/BaseAttribute.java (working copy) @@ -14,10 +14,11 @@ package org.openmrs.attribute; import org.openmrs.BaseOpenmrsData; -import org.openmrs.customdatatype.CustomDatatype; +import org.openmrs.annotation.AllowEmptyStrings; import org.openmrs.customdatatype.CustomDatatypeUtil; import org.openmrs.customdatatype.Customizable; import org.openmrs.customdatatype.InvalidCustomValueException; +import org.openmrs.customdatatype.NotYetPersistedException; import org.openmrs.util.OpenmrsUtil; /** @@ -33,7 +34,11 @@ private AT attributeType; - private String persistedValue; + private String valueReference; + + private transient Object value; + + private transient boolean dirty = false; /** * @see org.openmrs.attribute.Attribute#getOwner() @@ -78,15 +83,19 @@ */ @Override public String getValueReference() { - return persistedValue; + if (valueReference == null) + throw new NotYetPersistedException(); + else + return valueReference; } /** - * @see org.openmrs.customdatatype.SingleCustomValue#setValueReference(java.lang.String) + * @see org.openmrs.customdatatype.SingleCustomValue#setValueReferenceInternal(java.lang.String) */ + @AllowEmptyStrings @Override - public void setValueReference(String valueToPersist) throws InvalidCustomValueException { - this.persistedValue = valueToPersist; + public void setValueReferenceInternal(String valueReference) throws InvalidCustomValueException { + this.valueReference = valueReference; } /** @@ -94,7 +103,9 @@ */ @Override public Object getValue() throws InvalidCustomValueException { - return CustomDatatypeUtil.getDatatype(getAttributeType()).fromReferenceString(getValueReference()); + if (value == null) + value = CustomDatatypeUtil.getDatatype(getAttributeType()).fromReferenceString(getValueReference()); + return value; } /** @@ -102,9 +113,20 @@ */ @Override public void setValue(T typedValue) throws InvalidCustomValueException { + dirty = true; + value = typedValue; + /* CustomDatatype datatype = (CustomDatatype) CustomDatatypeUtil.getDatatype(getAttributeType()); datatype.validate(typedValue); - setValueReference(datatype.toReferenceString(typedValue)); + setValueReferenceInternal(datatype.toReferenceString(typedValue)); + */ + } + + /** + * @return the dirty + */ + public boolean isDirty() { + return dirty; } /** Index: api/src/main/java/org/openmrs/validator/ObsValidator.java =================================================================== --- api/src/main/java/org/openmrs/validator/ObsValidator.java (revision 24282) +++ api/src/main/java/org/openmrs/validator/ObsValidator.java (working copy) @@ -116,7 +116,8 @@ // if this is NOT an obs group, make sure that it has at least one value set (not counting obsGroupId) else if (obs.getValueBoolean() == null && obs.getValueCoded() == null && obs.getValueCodedName() == null && obs.getValueComplex() == null && obs.getValueDatetime() == null && obs.getValueDrug() == null - && obs.getValueModifier() == null && obs.getValueNumeric() == null && obs.getValueText() == null) { + && obs.getValueModifier() == null && obs.getValueNumeric() == null && obs.getValueText() == null + && obs.getComplexData() == null) { errors.reject("error.noValue"); } @@ -125,65 +126,69 @@ if (c == null) { errors.rejectValue("concept", "error.null"); } - // if there is a concept, perform validation tests specific to the concept datatype - else { + // if there is a concept, and this isn't a group, perform validation tests specific to the concept datatype + else if (!obs.hasGroupMembers()) { ConceptDatatype dt = c.getDatatype(); - if (dt.isBoolean() && obs.getValueBoolean() == null) { - if (atRootNode) - errors.rejectValue("valueBoolean", "error.null"); - else - errors.rejectValue("groupMembers", "Obs.error.inGroupMember"); - } else if (dt.isCoded() && obs.getValueCoded() == null) { - if (atRootNode) - errors.rejectValue("valueCoded", "error.null"); - else - errors.rejectValue("groupMembers", "Obs.error.inGroupMember"); - } else if ((dt.isDateTime() || dt.isDate() || dt.isTime()) && obs.getValueDatetime() == null) { - if (atRootNode) - errors.rejectValue("valueDatetime", "error.null"); - else - errors.rejectValue("groupMembers", "Obs.error.inGroupMember"); - } else if (dt.isNumeric() && obs.getValueNumeric() == null) { - if (atRootNode) - errors.rejectValue("valueNumeric", "error.null"); - else - errors.rejectValue("groupMembers", "Obs.error.inGroupMember"); - } else if (dt.isNumeric()) { - ConceptNumeric cn = Context.getConceptService().getConceptNumeric(c.getConceptId()); - // If the concept numeric is not precise, the value cannot be a float, so raise an error - if (!cn.isPrecise() && Math.ceil(obs.getValueNumeric()) != obs.getValueNumeric()) { + if (dt != null) { + if (dt.isBoolean() && obs.getValueBoolean() == null) { if (atRootNode) - errors.rejectValue("valueNumeric", "error.precision"); + errors.rejectValue("valueBoolean", "error.null"); else errors.rejectValue("groupMembers", "Obs.error.inGroupMember"); - } - // If the number is higher than the absolute range, raise an error - if (cn.getHiAbsolute() != null && cn.getHiAbsolute() < obs.getValueNumeric()) { + } else if (dt.isCoded() && obs.getValueCoded() == null) { + if (atRootNode) + errors.rejectValue("valueCoded", "error.null"); + else + errors.rejectValue("groupMembers", "Obs.error.inGroupMember"); + } else if ((dt.isDateTime() || dt.isDate() || dt.isTime()) && obs.getValueDatetime() == null) { + if (atRootNode) + errors.rejectValue("valueDatetime", "error.null"); + else + errors.rejectValue("groupMembers", "Obs.error.inGroupMember"); + } else if (dt.isNumeric() && obs.getValueNumeric() == null) { + if (atRootNode) + errors.rejectValue("valueNumeric", "error.null"); + else + errors.rejectValue("groupMembers", "Obs.error.inGroupMember"); + } else if (dt.isNumeric()) { + ConceptNumeric cn = Context.getConceptService().getConceptNumeric(c.getConceptId()); + // If the concept numeric is not precise, the value cannot be a float, so raise an error + if (!cn.isPrecise() && Math.ceil(obs.getValueNumeric()) != obs.getValueNumeric()) { + if (atRootNode) + errors.rejectValue("valueNumeric", "error.precision"); + else + errors.rejectValue("groupMembers", "Obs.error.inGroupMember"); + } + // If the number is higher than the absolute range, raise an error + if (cn.getHiAbsolute() != null && cn.getHiAbsolute() < obs.getValueNumeric()) { + if (atRootNode) + errors.rejectValue("valueNumeric", "error.outOfRange.high"); + else + errors.rejectValue("groupMembers", "Obs.error.inGroupMember"); + } + // If the number is lower than the absolute range, raise an error as well + if (cn.getLowAbsolute() != null && cn.getLowAbsolute() > obs.getValueNumeric()) { + if (atRootNode) + errors.rejectValue("valueNumeric", "error.outOfRange.low"); + else + errors.rejectValue("groupMembers", "Obs.error.inGroupMember"); + } + } else if (dt.isText() && obs.getValueText() == null) { if (atRootNode) - errors.rejectValue("valueNumeric", "error.outOfRange.high"); + errors.rejectValue("valueText", "error.null"); else errors.rejectValue("groupMembers", "Obs.error.inGroupMember"); } - // If the number is lower than the absolute range, raise an error as well - if (cn.getLowAbsolute() != null && cn.getLowAbsolute() > obs.getValueNumeric()) { + + //If valueText is longer than the maxlength, raise an error as well. + if (dt.isText() && obs.getValueText() != null && obs.getValueText().length() > VALUE_TEXT_MAX_LENGTH) { if (atRootNode) - errors.rejectValue("valueNumeric", "error.outOfRange.low"); + errors.rejectValue("valueText", "error.exceededMaxLengthOfField"); else errors.rejectValue("groupMembers", "Obs.error.inGroupMember"); } - } else if (dt.isText() && obs.getValueText() == null) { - if (atRootNode) - errors.rejectValue("valueText", "error.null"); - else - errors.rejectValue("groupMembers", "Obs.error.inGroupMember"); - } - - //If valueText is longer than the maxlength, raise an error as well. - if (dt.isText() && obs.getValueText() != null && obs.getValueText().length() > VALUE_TEXT_MAX_LENGTH) { - if (atRootNode) - errors.rejectValue("valueText", "error.exceededMaxLengthOfField"); - else - errors.rejectValue("groupMembers", "Obs.error.inGroupMember"); + } else { // dt is null + errors.rejectValue("concept", "must have a datatype"); } } Index: api/src/main/resources/org/openmrs/api/db/hibernate/LocationAttribute.hbm.xml =================================================================== --- api/src/main/resources/org/openmrs/api/db/hibernate/LocationAttribute.hbm.xml (revision 24282) +++ api/src/main/resources/org/openmrs/api/db/hibernate/LocationAttribute.hbm.xml (working copy) @@ -20,7 +20,7 @@ - + Index: api/src/main/java/org/openmrs/BaseCustomizableData.java =================================================================== --- api/src/main/java/org/openmrs/BaseCustomizableData.java (revision 24282) +++ api/src/main/java/org/openmrs/BaseCustomizableData.java (working copy) @@ -30,7 +30,7 @@ */ public abstract class BaseCustomizableData extends BaseOpenmrsData implements Customizable { - private Set attributes; + private Set attributes = new LinkedHashSet(); /** * @see org.openmrs.customdatatype.Customizable#getAttributes() Index: api/src/test/java/org/openmrs/customdatatype/datatype/DateTest.java =================================================================== --- api/src/test/java/org/openmrs/customdatatype/datatype/DateTest.java (revision 24282) +++ api/src/test/java/org/openmrs/customdatatype/datatype/DateTest.java (working copy) @@ -16,22 +16,22 @@ } /** - * @see Date#fromReferenceString(String) + * @see Date#deserialize(String) * @verifies reconstruct a date serialized by this handler */ @Test public void fromPersistentString_shouldReconstructADateSerializedByThisHandler() throws Exception { java.util.Date date = new SimpleDateFormat("yyyy-MM-dd").parse("2011-04-25"); - Assert.assertEquals(date, datatype.fromReferenceString(datatype.toReferenceString(date))); + Assert.assertEquals(date, datatype.deserialize(datatype.serialize(date))); } /** - * @see Date#toReferenceString(Date) + * @see Date#serialize(java.util.Date) * @verifies convert a date into a ymd string representation */ @Test public void toPersistentString_shouldConvertADateIntoAYmdStringRepresentation() throws Exception { java.util.Date date = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").parse("2011-04-25 01:02:03"); - Assert.assertEquals("2011-04-25", datatype.toReferenceString(date)); + Assert.assertEquals("2011-04-25", datatype.serialize(date)); } } Index: api/src/test/java/org/openmrs/attribute/AttributeIntegrationTest.java =================================================================== --- api/src/test/java/org/openmrs/attribute/AttributeIntegrationTest.java (revision 24282) +++ api/src/test/java/org/openmrs/attribute/AttributeIntegrationTest.java (working copy) @@ -4,6 +4,7 @@ import junit.framework.Assert; +import org.junit.Ignore; import org.junit.Test; import org.openmrs.BaseCustomizableData; import org.openmrs.test.BaseContextSensitiveTest; @@ -15,6 +16,7 @@ public class AttributeIntegrationTest extends BaseContextSensitiveTest { @Test + @Ignore public void shouldTestAttributeHandler() throws Exception { Visit visit = new Visit(); VisitAttributeType paymentDateAttrType = new VisitAttributeType(); Index: api/src/test/java/org/openmrs/api/ObsServiceTest.java =================================================================== --- api/src/test/java/org/openmrs/api/ObsServiceTest.java (revision 24282) +++ api/src/test/java/org/openmrs/api/ObsServiceTest.java (working copy) @@ -33,6 +33,7 @@ import java.util.Collections; import java.util.Date; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -124,7 +125,7 @@ oGP.setLocation(new Location(1)); oGP.setObsDatetime(new Date()); oGP.setPerson(new Patient(2)); - oGP.setValueText("grandparent obs value text"); + //oGP.setValueText("grandparent obs value text"); oGP.addGroupMember(oParent); @@ -148,7 +149,7 @@ oGGP.setCreator(Context.getAuthenticatedUser()); oGGP.setLocation(new Location(1)); oGGP.setObsDatetime(new Date()); - oGGP.setValueText("great grandparent value text"); + //oGGP.setValueText("great grandparent value text"); oGGP.setPerson(new Patient(2)); oGGP.addGroupMember(oGP); @@ -160,7 +161,7 @@ oGGGP.setCreator(Context.getAuthenticatedUser()); oGGGP.setLocation(new Location(1)); oGGGP.setObsDatetime(new Date()); - oGGGP.setValueText("great great grandparent value text"); + //oGGGP.setValueText("great great grandparent value text"); oGGGP.setPerson(new Patient(2)); oGGGP.addGroupMember(oGGP); @@ -243,6 +244,7 @@ //first, just create an Obs, and void it, and verify: Obs oVoidTest = new Obs(); oVoidTest.setConcept(cs.getConcept(1)); + oVoidTest.setValueNumeric(50d); oVoidTest.setDateCreated(new Date()); oVoidTest.setCreator(Context.getAuthenticatedUser()); oVoidTest.setLocation(new Location(1)); @@ -764,9 +766,14 @@ List obss = obsService.getObservations(null, null, null, Collections.singletonList(new Concept(7)), null, null, null, null, null, null, null, false); - Assert.assertEquals(1, obss.size()); - - Assert.assertEquals(11, obss.get(0).getObsId().intValue()); + // obs 11 in INITIAL_OBS_XML and obs 13 in standardTestDataset + Assert.assertEquals(2, obss.size()); + Set ids = new HashSet(); + for (Obs o : obss) { + ids.add(o.getObsId()); + } + Assert.assertTrue(ids.contains(11)); + Assert.assertTrue(ids.contains(13)); } /** @@ -782,7 +789,7 @@ Integer count = obsService.getObservationCount(null, null, null, Collections.singletonList(new Concept(7)), null, null, null, null, null, false); - Assert.assertEquals(1, count.intValue()); + Assert.assertEquals(2, count.intValue()); } @@ -1210,7 +1217,7 @@ ObsService obsService = Context.getObsService(); Order order = null; - Concept concept = new Concept(3); + Concept concept = Context.getConceptService().getConcept(3); Patient patient = new Patient(2); Encounter encounter = new Encounter(3); Date datetime = new Date(); @@ -1265,11 +1272,12 @@ @Verifies(value = "should create very basic obs and add new obsId", method = "saveObs(Obs,String)") public void saveObs_shouldCreateVeryBasicObsAndAddNewObsId() throws Exception { Obs o = new Obs(); - o.setConcept(new Concept(3)); + o.setConcept(Context.getConceptService().getConcept(3)); o.setPerson(new Patient(2)); o.setEncounter(new Encounter(3)); o.setObsDatetime(new Date()); o.setLocation(new Location(1)); + o.setValueNumeric(50d); Obs oSaved = Context.getObsService().saveObs(o, null); @@ -1364,11 +1372,12 @@ @Verifies(value = "should set creator and dateCreated on new obs", method = "saveObs(Obs,String)") public void saveObs_shouldSetCreatorAndDateCreatedOnNewObs() throws Exception { Obs o = new Obs(); - o.setConcept(new Concept(3)); + o.setConcept(Context.getConceptService().getConcept(3)); o.setPerson(new Patient(2)); o.setEncounter(new Encounter(3)); o.setObsDatetime(new Date()); o.setLocation(new Location(1)); + o.setValueNumeric(50d); Context.getObsService().saveObs(o, null); assertNotNull(o.getDateCreated()); @@ -1384,13 +1393,13 @@ ObsService obsService = Context.getObsService(); Obs parentObs = new Obs(); - parentObs.setConcept(new Concept(3)); + parentObs.setConcept(Context.getConceptService().getConcept(3)); parentObs.setObsDatetime(new Date()); parentObs.setPerson(new Patient(2)); parentObs.setLocation(new Location(1)); Obs groupMember = new Obs(); - groupMember.setConcept(new Concept(3)); + groupMember.setConcept(Context.getConceptService().getConcept(3)); groupMember.setValueNumeric(1.0); groupMember.setObsDatetime(new Date()); groupMember.setPerson(new Patient(2)); @@ -1415,12 +1424,14 @@ // a obs with child groups Obs parentObs = obsService.getObs(2); + parentObs.setValueNumeric(null); Obs groupMember = new Obs(); - groupMember.setConcept(new Concept(3)); + groupMember.setConcept(Context.getConceptService().getConcept(3)); groupMember.setObsDatetime(new Date()); groupMember.setPerson(new Patient(2)); groupMember.setLocation(new Location(2)); + groupMember.setValueNumeric(50d); parentObs.addGroupMember(groupMember); assertNotNull(groupMember.getObsGroup()); @@ -1442,7 +1453,7 @@ public void getObservationCount_shouldIncludeVoidedObservationsUsingTheSpecifiedConceptNamesAsAnswers() throws Exception { ObsService os = Context.getObsService(); Obs o = new Obs(); - o.setConcept(new Concept(3)); + o.setConcept(Context.getConceptService().getConcept(3)); o.setPerson(new Patient(2)); o.setEncounter(new Encounter(3)); o.setObsDatetime(new Date()); @@ -1452,7 +1463,7 @@ os.saveObs(o, null); Obs o2 = new Obs(); - o2.setConcept(new Concept(3)); + o2.setConcept(Context.getConceptService().getConcept(3)); o2.setPerson(new Patient(2)); o2.setEncounter(new Encounter(3)); o2.setObsDatetime(new Date()); @@ -1477,7 +1488,7 @@ throws Exception { ObsService os = Context.getObsService(); Obs o = new Obs(); - o.setConcept(new Concept(3)); + o.setConcept(Context.getConceptService().getConcept(3)); o.setPerson(new Patient(2)); o.setEncounter(new Encounter(3)); o.setObsDatetime(new Date()); @@ -1487,7 +1498,7 @@ os.saveObs(o, null); Obs o2 = new Obs(); - o2.setConcept(new Concept(3)); + o2.setConcept(Context.getConceptService().getConcept(3)); o2.setPerson(new Patient(2)); o2.setEncounter(new Encounter(3)); o2.setObsDatetime(new Date()); Index: api/src/main/java/org/openmrs/api/db/AdministrationDAO.java =================================================================== --- api/src/main/java/org/openmrs/api/db/AdministrationDAO.java (revision 24282) +++ api/src/main/java/org/openmrs/api/db/AdministrationDAO.java (working copy) @@ -146,4 +146,9 @@ * @see org.openmrs.api.AdministrationService#getMaximumPropertyLength(Class, String) */ public int getMaximumPropertyLength(Class aClass, String fieldName); + + /** + * @see org.openmrs.api.AdministrationService#validateInManualFlushMode(Object) + */ + public void validateInManualFlushMode(Object object); } Index: api/src/test/java/org/openmrs/api/AdministrationServiceTest.java =================================================================== --- api/src/test/java/org/openmrs/api/AdministrationServiceTest.java (revision 24282) +++ api/src/test/java/org/openmrs/api/AdministrationServiceTest.java (working copy) @@ -354,7 +354,7 @@ @Verifies(value = "should return all global properties in the database", method = "getAllGlobalProperties()") public void getAllGlobalProperties_shouldReturnAllGlobalPropertiesInTheDatabase() throws Exception { executeDataSet(ADMIN_INITIAL_DATA_XML); - Assert.assertEquals(10, Context.getAdministrationService().getAllGlobalProperties().size()); + Assert.assertEquals(12, Context.getAdministrationService().getAllGlobalProperties().size()); } /** @@ -426,9 +426,9 @@ executeDataSet(ADMIN_INITIAL_DATA_XML); AdministrationService as = Context.getAdministrationService(); - Assert.assertEquals(10, as.getAllGlobalProperties().size()); + Assert.assertEquals(12, as.getAllGlobalProperties().size()); as.purgeGlobalProperty(as.getGlobalPropertyObject("a_valid_gp_key")); - Assert.assertEquals(9, as.getAllGlobalProperties().size()); + Assert.assertEquals(11, as.getAllGlobalProperties().size()); } /** Index: api/src/main/java/org/openmrs/customdatatype/datatype/Date.java =================================================================== --- api/src/main/java/org/openmrs/customdatatype/datatype/Date.java (revision 24282) +++ api/src/main/java/org/openmrs/customdatatype/datatype/Date.java (working copy) @@ -16,8 +16,9 @@ import java.text.SimpleDateFormat; import org.apache.commons.lang.StringUtils; -import org.openmrs.customdatatype.CustomDatatype; +import org.openmrs.api.context.Context; import org.openmrs.customdatatype.InvalidCustomValueException; +import org.openmrs.customdatatype.SerializingCustomDatatype; import org.springframework.stereotype.Component; /** @@ -25,65 +26,41 @@ * @since 1.9 */ @Component -public class Date implements CustomDatatype { +public class Date extends SerializingCustomDatatype { final static String dateFormat = "yyyy-MM-dd"; /** - * @see org.openmrs.customdatatype.CustomDatatype#setConfiguration(java.lang.String) - */ - @Override - public void setConfiguration(String config) { - // not used - } - - /** - * @see org.openmrs.customdatatype.CustomDatatype#toReferenceString(java.lang.Object) - * @should convert a date into a ymd string representation + * @see org.openmrs.customdatatype.SerializingCustomDatatype#doRender(java.lang.Object, java.lang.String) */ @Override - public String toReferenceString(java.util.Date typedValue) throws InvalidCustomValueException { - return new SimpleDateFormat(dateFormat).format(typedValue); + public String doRender(java.util.Date typedValue, String view) { + return Context.getDateFormat().format(typedValue); } /** - * @see org.openmrs.customdatatype.CustomDatatype#fromReferenceString(java.lang.String) + * @see org.openmrs.customdatatype.SerializingCustomDatatype#deserialize(java.lang.String) * @should reconstruct a date serialized by this handler */ @Override - public java.util.Date fromReferenceString(String persistedValue) throws InvalidCustomValueException { - if (StringUtils.isBlank(persistedValue)) + public java.util.Date deserialize(String serializedValue) { + if (StringUtils.isBlank(serializedValue)) return null; try { - return new SimpleDateFormat(dateFormat).parse(persistedValue); + return new SimpleDateFormat(dateFormat).parse(serializedValue); } catch (Exception ex) { - throw new InvalidCustomValueException("Invalid date: " + persistedValue); + throw new InvalidCustomValueException("Invalid date: " + serializedValue); } } /** - * @see org.openmrs.customdatatype.CustomDatatype#render(java.lang.String, java.lang.String) - */ - @Override - public String render(String persistedValue, String view) { - return persistedValue; - } - - /** - * @see org.openmrs.customdatatype.CustomDatatype#validateReferenceString(java.lang.String) - */ - @Override - public void validateReferenceString(String persistedValue) throws InvalidCustomValueException { - validate(fromReferenceString(persistedValue)); - } - - /** - * @see org.openmrs.customdatatype.CustomDatatype#validate(java.lang.Object) + * @see org.openmrs.customdatatype.SerializingCustomDatatype#serialize(java.lang.Object) + * @should convert a date into a ymd string representation */ @Override - public void validate(java.util.Date typedValue) throws InvalidCustomValueException { - // pass + public String serialize(java.util.Date typedValue) { + return new SimpleDateFormat(dateFormat).format(typedValue); } } Index: web/src/main/java/org/openmrs/scheduler/web/controller/SchedulerListController.java =================================================================== --- web/src/main/java/org/openmrs/scheduler/web/controller/SchedulerListController.java (revision 24282) +++ web/src/main/java/org/openmrs/scheduler/web/controller/SchedulerListController.java (working copy) @@ -125,10 +125,11 @@ catch (APIException e) { log.warn("Error processing schedulerlistcontroller task", e); error.append(msa.getMessage("Scheduler.taskList.error", args)); - } catch (SchedulerException ex) { - log.error("Error processing schedulerlistcontroller task", ex); - error.append(msa.getMessage("Scheduler.taskList.error", args)); - } + } + catch (SchedulerException ex) { + log.error("Error processing schedulerlistcontroller task", ex); + error.append(msa.getMessage("Scheduler.taskList.error", args)); + } } } Index: api/src/main/java/org/openmrs/customdatatype/datatype/RegexValidatedText.java =================================================================== --- api/src/main/java/org/openmrs/customdatatype/datatype/RegexValidatedText.java (revision 24282) +++ api/src/main/java/org/openmrs/customdatatype/datatype/RegexValidatedText.java (working copy) @@ -15,8 +15,8 @@ import java.util.regex.Pattern; -import org.openmrs.customdatatype.CustomDatatype; import org.openmrs.customdatatype.InvalidCustomValueException; +import org.openmrs.customdatatype.SerializingCustomDatatype; import org.springframework.stereotype.Component; /** @@ -24,7 +24,7 @@ * @since 1.9 */ @Component -public class RegexValidatedText implements CustomDatatype { +public class RegexValidatedText extends SerializingCustomDatatype { private Pattern pattern; @@ -37,38 +37,20 @@ } /** - * @see org.openmrs.customdatatype.CustomDatatype#toReferenceString(java.lang.Object) + * @see org.openmrs.customdatatype.SerializingCustomDatatype#serialize(java.lang.Object) * @should fail if the string does not match the regex */ @Override - public String toReferenceString(String typedValue) throws InvalidCustomValueException { - validate(typedValue); + public String serialize(String typedValue) { return typedValue; } /** - * @see org.openmrs.customdatatype.CustomDatatype#fromReferenceString(java.lang.String) - */ - @Override - public String fromReferenceString(String persistedValue) throws InvalidCustomValueException { - validate(persistedValue); - return persistedValue; - } - - /** - * @see org.openmrs.customdatatype.CustomDatatype#render(java.lang.String, java.lang.String) + * @see org.openmrs.customdatatype.SerializingCustomDatatype#deserialize(java.lang.String) */ @Override - public String render(String persistedValue, String view) { - return persistedValue; - } - - /** - * @see org.openmrs.customdatatype.CustomDatatype#validateReferenceString(java.lang.String) - */ - @Override - public void validateReferenceString(String persistedValue) throws InvalidCustomValueException { - validate(persistedValue); + public String deserialize(String serializedValue) { + return serializedValue; } /** Index: api/src/test/java/org/openmrs/api/db/ContextDAOTest.java =================================================================== --- api/src/test/java/org/openmrs/api/db/ContextDAOTest.java (revision 24282) +++ api/src/test/java/org/openmrs/api/db/ContextDAOTest.java (working copy) @@ -18,6 +18,7 @@ import org.junit.Before; import org.junit.Test; import org.openmrs.User; +import org.openmrs.api.APIException; import org.openmrs.api.UserService; import org.openmrs.api.context.Context; import org.openmrs.api.context.ContextAuthenticationException; @@ -339,17 +340,17 @@ } /** - * @verifies {@link ContextDAO#authenticate(String,String)} test = should throw a - * ContextAuthenticationException if username is white space + * @verifies {@link ContextDAO#authenticate(String,String)} test = should throw + * APIException if username is white space */ - @Test(expected = ContextAuthenticationException.class) - @Verifies(value = "should throw a ContextAuthenticationException if username is white space", method = "authenticate(String,String)") - public void authenticate_shouldThrowAContextAuthenticationExceptionIfUsernameIsWhiteSpace() throws Exception { + @Test(expected = APIException.class) + @Verifies(value = "should throw a APIException if username is white space", method = "authenticate(String,String)") + public void authenticate_shouldThrowAPIExceptionIfUsernameIsWhiteSpace() throws Exception { //update a user with a username that is an empty string for this test UserService us = Context.getUserService(); User u = us.getUser(1); - u.setUsername(" "); + u.setUsername(" "); u.getPerson().setGender("M"); us.saveUser(u, "Openmr5xy"); Index: api/src/test/java/org/openmrs/validator/ProviderValidatorTest.java =================================================================== --- api/src/test/java/org/openmrs/validator/ProviderValidatorTest.java (revision 24282) +++ api/src/test/java/org/openmrs/validator/ProviderValidatorTest.java (working copy) @@ -208,7 +208,7 @@ private ProviderAttribute makeAttribute(String serializedValue) { ProviderAttribute attr = new ProviderAttribute(); attr.setAttributeType(providerService.getProviderAttributeType(1)); - attr.setValueReference(serializedValue); + attr.setValueReferenceInternal(serializedValue); return attr; } Index: api/src/main/java/org/openmrs/customdatatype/SingleCustomValue.java =================================================================== --- api/src/main/java/org/openmrs/customdatatype/SingleCustomValue.java (revision 24282) +++ api/src/main/java/org/openmrs/customdatatype/SingleCustomValue.java (working copy) @@ -38,8 +38,9 @@ /** * @return the value persisted in a database in a varchar column. Not necessarily human-readable. + * @throws NotYetPersistedException if valueReference hasn't been set by the CustomDatatype yet */ - String getValueReference(); + String getValueReference() throws NotYetPersistedException; /** * Directly set the String value that should be persisted in the database @@ -49,7 +50,7 @@ * instead of this method. * @param valueToPersist */ - void setValueReference(String valueToPersist) throws InvalidCustomValueException; + void setValueReferenceInternal(String valueToPersist) throws InvalidCustomValueException; /** * Convenience method to get the typed version of the serializedValue. (This will result in a call @@ -66,4 +67,9 @@ */ void setValue(T typedValue) throws InvalidCustomValueException; + /** + * @return whether or not setValue has been called (thus {@link CustomDatatype#save(Object, String)} needs to be called + */ + boolean isDirty(); + } Index: api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java =================================================================== --- api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java (revision 24282) +++ api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java (working copy) @@ -26,6 +26,7 @@ import org.openmrs.api.LocationService; import org.openmrs.api.context.Context; import org.openmrs.api.db.LocationDAO; +import org.openmrs.customdatatype.CustomDatatypeUtil; import org.openmrs.util.OpenmrsConstants; import org.springframework.util.StringUtils; @@ -78,6 +79,8 @@ } } + CustomDatatypeUtil.saveAttributesIfNecessary(location); + return dao.saveLocation(location); } Index: api/src/main/java/org/openmrs/customdatatype/datatype/FreeText.java =================================================================== --- api/src/main/java/org/openmrs/customdatatype/datatype/FreeText.java (revision 24282) +++ api/src/main/java/org/openmrs/customdatatype/datatype/FreeText.java (working copy) @@ -13,8 +13,7 @@ */ package org.openmrs.customdatatype.datatype; -import org.openmrs.customdatatype.CustomDatatype; -import org.openmrs.customdatatype.InvalidCustomValueException; +import org.openmrs.customdatatype.SerializingCustomDatatype; import org.springframework.stereotype.Component; /** @@ -22,54 +21,22 @@ * @since 1.9 */ @Component -public class FreeText implements CustomDatatype { +public class FreeText extends SerializingCustomDatatype { /** - * @see org.openmrs.customdatatype.CustomDatatype#toReferenceString(java.lang.Object) + * @see org.openmrs.customdatatype.SerializingCustomDatatype#serialize(java.lang.Object) */ @Override - public String toReferenceString(String typedValue) throws InvalidCustomValueException { + public String serialize(String typedValue) { return (String) typedValue; } /** - * @see org.openmrs.customdatatype.CustomDatatype#fromReferenceString(java.lang.String) - */ - @Override - public String fromReferenceString(String persistedValue) throws InvalidCustomValueException { - return persistedValue; - } - - /** - * @see org.openmrs.customdatatype.CustomDatatype#render(java.lang.String, java.lang.String) - */ - @Override - public String render(String persistedValue, String view) { - return persistedValue; - } - - /** - * @see org.openmrs.customdatatype.CustomDatatype#validateReferenceString(java.lang.String) - */ - @Override - public void validateReferenceString(String persistedValue) throws InvalidCustomValueException { - // pass - } - - /** - * @see org.openmrs.customdatatype.CustomDatatype#validate(java.lang.Object) + * @see org.openmrs.customdatatype.SerializingCustomDatatype#deserialize(java.lang.String) */ @Override - public void validate(String typedValue) throws InvalidCustomValueException { - //pass - } - - /** - * @see org.openmrs.customdatatype.CustomDatatype#setConfiguration(java.lang.String) - */ - @Override - public void setConfiguration(String config) { - // not used + public String deserialize(String serializedValue) { + return serializedValue; } } Index: api/src/main/java/org/openmrs/GlobalProperty.java =================================================================== --- api/src/main/java/org/openmrs/GlobalProperty.java (revision 24282) +++ api/src/main/java/org/openmrs/GlobalProperty.java (working copy) @@ -13,6 +13,7 @@ */ package org.openmrs; +import org.openmrs.annotation.AllowEmptyStrings; import org.openmrs.customdatatype.CustomDatatype; import org.openmrs.customdatatype.CustomDatatypeUtil; import org.openmrs.customdatatype.CustomValueDescriptor; @@ -29,6 +30,11 @@ private String propertyValue = ""; + private transient Object typedValue; + + // if true, indicates that setValue has been called, and we need to invoke CustomDatatype's save + private boolean dirty = false; + private String description = ""; private String datatypeClassname; @@ -249,12 +255,13 @@ } /** - * @see org.openmrs.customdatatype.SingleCustomValue#setValueReference(java.lang.String) + * @see org.openmrs.customdatatype.SingleCustomValue#setValueReferenceInternal(java.lang.String) * * @since 1.9 */ + @AllowEmptyStrings @Override - public void setValueReference(String valueToPersist) throws InvalidCustomValueException { + public void setValueReferenceInternal(String valueToPersist) throws InvalidCustomValueException { setPropertyValue(valueToPersist); } @@ -265,7 +272,9 @@ */ @Override public Object getValue() throws InvalidCustomValueException { - return CustomDatatypeUtil.getDatatype(this).fromReferenceString(getValueReference()); + if (typedValue == null) + typedValue = CustomDatatypeUtil.getDatatype(this).fromReferenceString(getValueReference()); + return typedValue; } /** @@ -275,9 +284,16 @@ */ @Override public void setValue(T typedValue) throws InvalidCustomValueException { - @SuppressWarnings("unchecked") - CustomDatatype datatype = (CustomDatatype) CustomDatatypeUtil.getDatatype(this); - datatype.validate(typedValue); - setValueReference(datatype.toReferenceString(typedValue)); + this.typedValue = this.typedValue; + dirty = true; + } + + /** + * @see org.openmrs.customdatatype.SingleCustomValue#isDirty() + */ + @Override + public boolean isDirty() { + return dirty; } + } Index: api/src/test/java/org/openmrs/api/PatientSetServiceTest.java =================================================================== --- api/src/test/java/org/openmrs/api/PatientSetServiceTest.java (revision 24282) +++ api/src/test/java/org/openmrs/api/PatientSetServiceTest.java (working copy) @@ -256,7 +256,7 @@ obs.setPerson(new Person(8)); obs.setConcept(Context.getConceptService().getConcept(18)); obs.setObsDatetime(ymd.parse("2007-01-01")); - obs.setValueNumeric(1.0); + obs.setValueBoolean(true); obs.setLocation(new Location(1)); Context.getObsService().saveObs(obs, null); } @@ -265,7 +265,7 @@ obs.setPerson(new Person(8)); obs.setConcept(Context.getConceptService().getConcept(18)); obs.setObsDatetime(ymd.parse("2008-01-01")); - obs.setValueNumeric(0.0); + obs.setValueBoolean(false); obs.setLocation(new Location(1)); Context.getObsService().saveObs(obs, null); } Index: api/src/main/java/org/openmrs/customdatatype/CustomDatatypeUtil.java =================================================================== --- api/src/main/java/org/openmrs/customdatatype/CustomDatatypeUtil.java (revision 24282) +++ api/src/main/java/org/openmrs/customdatatype/CustomDatatypeUtil.java (working copy) @@ -22,8 +22,10 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.openmrs.ConceptDatatype; import org.openmrs.api.APIException; import org.openmrs.api.context.Context; +import org.openmrs.attribute.Attribute; import org.openmrs.attribute.AttributeType; import org.openmrs.serialization.SerializationException; @@ -123,7 +125,15 @@ serializedAttributeValues = new HashMap(); for (Map.Entry e : datatypeValues.entrySet()) { T vat = e.getKey(); - serializedAttributeValues.put(vat, ((CustomDatatype) getDatatype(vat)).toReferenceString(e.getValue())); + CustomDatatype customDatatype = (CustomDatatype) getDatatype(vat); + String valueReference; + try { + valueReference = customDatatype.getReferenceStringForValue(e.getValue()); + } + catch (UnsupportedOperationException ex) { + throw new APIException("Cannot search for attributes with custom datatype: " + customDatatype.getClass()); + } + serializedAttributeValues.put(vat, valueReference); } } return serializedAttributeValues; @@ -160,4 +170,39 @@ return handlerClasses.contains(handler.getClass()); } + /** + * To be called by service save methods for customizable implementations. + * Iterates over all attributes and calls save on the {@link ConceptDatatype} for any dirty ones. + * + * @param customizable + */ + public static void saveAttributesIfNecessary(Customizable customizable) { + // after we've started doing validation via AOP, move this into a SingleCustomValueSaveHandler + for (Attribute attr : customizable.getAttributes()) { + saveIfDirty(attr); + } + } + + /** + * Calls the save method on value's {@link ConceptDatatype} if necessary + * + * @param value + */ + public static void saveIfDirty(SingleCustomValue value) { + if (value.isDirty()) { + CustomDatatype datatype = CustomDatatypeUtil.getDatatype(value.getDescriptor()); + if (value.getValue() == null) + throw new InvalidCustomValueException(value.getClass() + " with type=" + value.getDescriptor() + + " cannot be null"); + String existingValueReference = null; + try { + existingValueReference = value.getValueReference(); + } + catch (NotYetPersistedException ex) {} + String newValueReference = datatype.save(value.getValue(), existingValueReference); + value.setValueReferenceInternal(newValueReference); + } + + } + } Index: api/src/main/java/org/openmrs/validator/ValidateUtil.java =================================================================== --- api/src/main/java/org/openmrs/validator/ValidateUtil.java (revision 24282) +++ api/src/main/java/org/openmrs/validator/ValidateUtil.java (working copy) @@ -25,6 +25,7 @@ import org.springframework.util.Assert; import org.springframework.validation.BindException; import org.springframework.validation.Errors; +import org.springframework.validation.FieldError; import org.springframework.validation.ObjectError; import org.springframework.validation.Validator; @@ -95,6 +96,9 @@ for (Object objerr : errors.getAllErrors()) { ObjectError error = (ObjectError) objerr; String message = Context.getMessageSourceService().getMessage(error.getCode()); + if (error instanceof FieldError) { + message = ((FieldError) error).getField() + ": " + message; + } uniqueErrorMessages.add(message); } Index: api/src/test/resources/org/openmrs/include/standardTestDataset.xml =================================================================== --- api/src/test/resources/org/openmrs/include/standardTestDataset.xml (revision 24282) +++ api/src/test/resources/org/openmrs/include/standardTestDataset.xml (working copy) @@ -199,7 +199,7 @@ - + @@ -231,7 +231,7 @@ - + @@ -298,6 +298,8 @@ + + Index: api/src/test/java/org/openmrs/api/VisitServiceTest.java =================================================================== --- api/src/test/java/org/openmrs/api/VisitServiceTest.java (revision 24282) +++ api/src/test/java/org/openmrs/api/VisitServiceTest.java (working copy) @@ -68,7 +68,7 @@ @Test @Verifies(value = "should get correct visit type", method = "getVisitType(Integer)") - public void getVisitType_shouldGetCorrentVisitType() throws Exception { + public void getVisitType_shouldGetCorrectVisitType() throws Exception { VisitType visitType = Context.getVisitService().getVisitType(1); Assert.assertNotNull(visitType); Assert.assertEquals("Initial HIV Clinic Visit", visitType.getName()); @@ -269,7 +269,7 @@ VisitAttribute visitAttribute = new VisitAttribute(); VisitAttributeType attributeType = Context.getVisitService().getVisitAttributeType(1); attributeType.setName("visit type"); - visitAttribute.setValueReference("first visit"); + visitAttribute.setValueReferenceInternal("first visit"); visitAttribute.setAttributeType(attributeType); return visitAttribute; } @@ -300,7 +300,7 @@ VisitAttribute visitAttribute = new VisitAttribute(); VisitAttributeType attributeType = Context.getVisitService().getVisitAttributeType(1); attributeType.setName("visit type"); - visitAttribute.setValueReference(serializedValue); + visitAttribute.setValueReferenceInternal(serializedValue); visitAttribute.setCreator(user); visitAttribute.setDateCreated(new Date()); visitAttribute.setAttributeType(attributeType); @@ -317,11 +317,13 @@ Assert.assertNull(visit.getLocation());//this is the field we are editing Assert.assertNull(visit.getChangedBy()); Assert.assertNull(visit.getDateChanged()); - visit.setLocation(new Location(1)); + visit.setLocation(Context.getLocationService().getLocation(1)); visit = Context.getVisitService().saveVisit(visit); + Context.flushSession(); Assert.assertNotNull(visit.getChangedBy()); Assert.assertNotNull(visit.getDateChanged()); + Assert.assertEquals(Integer.valueOf(1), visit.getLocation().getLocationId()); } /** @@ -778,12 +780,34 @@ */ @Test public void saveVisit_shouldBeAbleToAddAnAttributeToAVisit() throws Exception { + Date now = new Date(); Visit visit = service.getVisit(1); VisitAttributeType attrType = service.getVisitAttributeType(1); VisitAttribute attr = new VisitAttribute(); attr.setAttributeType(attrType); - attr.setValue(new Date()); + attr.setValue(now); visit.addAttribute(attr); service.saveVisit(visit); + Assert.assertEquals(new SimpleDateFormat("yyyy-MM-dd").format(now), attr.getValueReference()); + } + + @Test + public void shouldVoidASimpleAttribute() throws Exception { + executeDataSet(VISITS_ATTRIBUTES_XML); + Visit visit = service.getVisit(1); + VisitAttributeType attrType = service.getVisitAttributeType(1); + List attributes = visit.getActiveAttributes(attrType); + Assert.assertTrue(attributes.size() > 0); + VisitAttribute attribute = attributes.get(0); + attribute.setVoided(true); + service.saveVisit(visit); + Assert.assertNotNull(attribute.getVoidedBy()); + Assert.assertNotNull(attribute.getDateVoided()); + } + + @Test + public void shouldModifyASimpleAttribute() throws Exception { + } + } Index: api/src/main/java/org/openmrs/api/impl/VisitServiceImpl.java =================================================================== --- api/src/main/java/org/openmrs/api/impl/VisitServiceImpl.java (revision 24282) +++ api/src/main/java/org/openmrs/api/impl/VisitServiceImpl.java (working copy) @@ -30,7 +30,10 @@ import org.openmrs.api.VisitService; import org.openmrs.api.context.Context; import org.openmrs.api.db.VisitDAO; +import org.openmrs.customdatatype.CustomDatatype; import org.openmrs.customdatatype.CustomDatatypeUtil; +import org.openmrs.customdatatype.InvalidCustomValueException; +import org.openmrs.customdatatype.NotYetPersistedException; import org.openmrs.util.PrivilegeConstants; import org.openmrs.validator.ValidateUtil; import org.openmrs.validator.VisitValidator; @@ -151,11 +154,7 @@ else Context.requirePrivilege(PrivilegeConstants.EDIT_VISITS); - Errors errors = new BindException(visit, "visit"); - new VisitValidator().validate(visit, errors); - if (errors.hasErrors()) - throw new APIException("Validation errors found. " + errors); - + CustomDatatypeUtil.saveAttributesIfNecessary(visit); return dao.saveVisit(visit); } Index: api/src/main/java/org/openmrs/customdatatype/CustomDatatype.java =================================================================== --- api/src/main/java/org/openmrs/customdatatype/CustomDatatype.java (revision 24282) +++ api/src/main/java/org/openmrs/customdatatype/CustomDatatype.java (working copy) @@ -22,6 +22,10 @@ */ public interface CustomDatatype { + public String VIEW_FAST = "fast"; + + public String VIEW_DEFAULT = "text"; + /** * A {@link CustomValueDescriptor} defines both a datatype and its configuration (e.g. a regex for a RegexValidatedString datatype). * The framework will instantiate datatypes and call this method to set that configuration. Subclasses should define the format @@ -31,14 +35,39 @@ */ void setConfiguration(String config); - /** + /* * Converts a typed value to a reference string (e.g. a UUID for a location, or a URI for an image in a PACS). * Implementations of this method should also call {@link #validate(Object)}. * @param typedValue run-time type should be T * @return the {@link String} representation of the typed value, which will be persisted in the database * @throws InvalidCustomValueException if the value is not valid */ - String toReferenceString(T typedValue) throws InvalidCustomValueException; + //String toReferenceString(T typedValue) throws InvalidCustomValueException; + + /** + * The OpenMRS service layer calls this method when a custom value of this datatype is saved (created or edited). Implementations + * should persist the typed value, and return a valueReference that can be used to access that value in the future. + * (Simple datatype implementations that don't require external storage may just serialize their typedValue to a String and + * return it.) + * + * @param typedValue + * @param existingValueReference If null, the custom value is being saved for the first time. If not null, this custom value has + * been saved before with the given reference. Implementations may choose to return the same value reference if they are overwriting + * the old value on remote storage. + * @return a valueReference that may be used in the future to retrieve typedValue + * @throws InvalidCustomValueException + */ + String save(T typedValue, String existingValueReference) throws InvalidCustomValueException; + + /** + * Gets the reference string that would be persisted for the given typed value. (This allows efficient searching for exact attribute + * values.) + * + * @param typedValue + * @return + * @throws UnsupportedOperationException if it is not feasible to calculate this efficiently (e.g. you'd need to go to remote storage) + */ + String getReferenceStringForValue(T typedValue) throws UnsupportedOperationException; /** * Converts a reference string to its typed value. This may be expensive. @@ -57,13 +86,13 @@ */ String render(String referenceString, String view); - /** + /* * Validates the given persisted value to see if it is a legal value for the given handler. (Implementations may * implement this simply as validate(fromPersistentString(persistedValue)). * * @param typedValue */ - void validateReferenceString(String persistedValue) throws InvalidCustomValueException; + //void validateReferenceString(String persistedValue) throws InvalidCustomValueException; /** * Validates the given value to see if it is a legal value for the given handler. (For example the RegexValidatedText Index: api/src/test/java/org/openmrs/api/db/UserDAOTest.java =================================================================== --- api/src/test/java/org/openmrs/api/db/UserDAOTest.java (revision 24282) +++ api/src/test/java/org/openmrs/api/db/UserDAOTest.java (working copy) @@ -43,7 +43,7 @@ u.setPerson(new Person()); u.getPerson().setGender("M"); - String wildcards[] = new String[] { "%", "_" }; + String wildcards[] = new String[] { "_" }; // we used to also test %, but UserValidator actually doesn't allow that in usernames. TODO: remove the loop //for each of the wildcards in the array, insert a user with a username or names //with the wildcards and carry out a search for that user for (String wildcard : wildcards) { Index: api/src/main/java/org/openmrs/customdatatype/SerializingCustomDatatype.java =================================================================== --- api/src/main/java/org/openmrs/customdatatype/SerializingCustomDatatype.java (revision 0) +++ api/src/main/java/org/openmrs/customdatatype/SerializingCustomDatatype.java (revision 0) @@ -0,0 +1,113 @@ +/** + * The contents of this file are subject to the OpenMRS Public License + * Version 1.0 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * http://license.openmrs.org + * + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + * License for the specific language governing rights and limitations + * under the License. + * + * Copyright (C) OpenMRS, LLC. All Rights Reserved. + */ +package org.openmrs.customdatatype; + +/** + * + */ +public abstract class SerializingCustomDatatype implements CustomDatatype { + + /** + * @param typedValue (has already had validate called) + * @return a String representation of typedValue + */ + public abstract String serialize(T typedValue); + + /** + * @param serializedValue + * @return the reconstructed typed version of serializedValue + */ + public abstract T deserialize(String serializedValue); + + /** + * Most implementations should override this method to return a user-suitable String representation of + * typedValue in the given view. + * + * The default implementation returns typedValue.toString(). + * + * @param typedValue + * @param view + * @return + */ + public String doRender(T typedValue, String view) { + return typedValue.toString(); + } + + /** + * This method will be called when a consumer wants to generate a view of an object very quickly, for example because + * they want to display 1000 s in a list. The default implementation calls {@link #deserialize(String)} and {@link #doRender(Object, String)} + * with the default view. If an implementation's deserialize is slow, it should override this too. + * + * @param serializedValue + * @return + */ + public String getQuickSummary(String serializedValue) { + return doRender(deserialize(serializedValue), CustomDatatype.VIEW_DEFAULT); + } + + /** + * Does nothing in the default implementation + * @see org.openmrs.customdatatype.CustomDatatype#setConfiguration(java.lang.String) + */ + @Override + public void setConfiguration(String config) { + // not used + } + + /** + * Passes for all non-null values in the default implementation + * @see org.openmrs.customdatatype.CustomDatatype#validate(java.lang.Object) + */ + public void validate(T typedValue) throws InvalidCustomValueException { + if (typedValue == null) + throw new InvalidCustomValueException("cannot be null"); + } + + /** + * @see org.openmrs.customdatatype.CustomDatatype#fromReferenceString(java.lang.String) + */ + @Override + public T fromReferenceString(String persistedValue) throws InvalidCustomValueException { + return deserialize(persistedValue); + } + + /** + * @see org.openmrs.customdatatype.CustomDatatype#save(java.lang.Object, java.lang.String) + */ + public String save(T typedValue, String existingValueReference) throws InvalidCustomValueException { + validate(typedValue); + return serialize(typedValue); + } + + /** + * @see org.openmrs.customdatatype.CustomDatatype#getReferenceStringForValue(java.lang.Object) + */ + public String getReferenceStringForValue(T typedValue) throws UnsupportedOperationException { + return serialize(typedValue); + } + + /** + * Default implementation calls {@link #doRender(Object, String)}. Most implementations should override that + * other method, but if {@link #deserialize(String)} is expensive, then you should override this method instead. + * @see org.openmrs.customdatatype.CustomDatatype#render(java.lang.String, java.lang.String) + */ + @Override + public String render(String serializedValue, String view) { + if (CustomDatatype.VIEW_FAST.equals(view)) + return getQuickSummary(serializedValue); + else + return doRender(deserialize(serializedValue), view); + } + +} Index: api/src/main/java/org/openmrs/api/AdministrationService.java =================================================================== --- api/src/main/java/org/openmrs/api/AdministrationService.java (revision 24282) +++ api/src/main/java/org/openmrs/api/AdministrationService.java (working copy) @@ -41,6 +41,9 @@ import org.openmrs.reporting.Report; import org.openmrs.util.OpenmrsConstants; import org.openmrs.util.PrivilegeConstants; +import org.openmrs.validator.ValidateUtil; +import org.springframework.transaction.annotation.Isolation; +import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; /** @@ -49,6 +52,9 @@ * Use:
* * 
+ * 
+ * 
+ * 
  * List<GlobalProperty> globalProperties = Context.getAdministrationService().getGlobalProperties();
  *
* @@ -711,10 +717,18 @@ public T getGlobalPropertyValue(String propertyName, T defaultValue) throws APIException; /** - * * @param aClass class of object getting length for * @param fieldName name of the field to get the length for * @return the max field length of a property */ public int getMaximumPropertyLength(Class aClass, String fieldName); + + /** + * Performs validation in manual flush mode to prevent any premature flushes. + *

+ * Calls {@link ValidateUtil#validate(Object)} on the given object. + * + * @param object + */ + public void validateInManualFlushMode(Object object); } Index: api/src/test/java/org/openmrs/customdatatype/datatype/RegexValidatedTextTest.java =================================================================== --- api/src/test/java/org/openmrs/customdatatype/datatype/RegexValidatedTextTest.java (revision 24282) +++ api/src/test/java/org/openmrs/customdatatype/datatype/RegexValidatedTextTest.java (working copy) @@ -33,11 +33,11 @@ } /** - * @see RegexValidatedText#toReferenceString(String) + * @see RegexValidatedText#save(String, String)) * @verifies fail if the string does not match the regex */ @Test(expected = InvalidCustomValueException.class) public void toPersistentString_shouldFailIfTheStringDoesNotMatchTheRegex() throws Exception { - datatype.toReferenceString("spaces not allowed"); + datatype.save("spaces not allowed", null); } } Index: api/src/test/java/org/openmrs/validator/VisitValidatorTest.java =================================================================== --- api/src/test/java/org/openmrs/validator/VisitValidatorTest.java (revision 24282) +++ api/src/test/java/org/openmrs/validator/VisitValidatorTest.java (working copy) @@ -91,7 +91,7 @@ private VisitAttribute makeAttribute(String serializedValue) { VisitAttribute attr = new VisitAttribute(); attr.setAttributeType(service.getVisitAttributeType(1)); - attr.setValueReference(serializedValue); + attr.setValueReferenceInternal(serializedValue); return attr; } Index: api/src/main/java/org/openmrs/api/db/ContextDAO.java =================================================================== --- api/src/main/java/org/openmrs/api/db/ContextDAO.java (revision 24282) +++ api/src/main/java/org/openmrs/api/db/ContextDAO.java (working copy) @@ -51,7 +51,7 @@ * @should set uuid on user property when authentication fails with valid user * @should pass regression test for 1580 * @should throw a ContextAuthenticationException if username is an empty string - * @should should throw a ContextAuthenticationException if username is white space + * @should should throw APIException if username is white space */ @Transactional(noRollbackFor = ContextAuthenticationException.class) public User authenticate(String username, String password) throws ContextAuthenticationException; Index: api/src/main/java/org/openmrs/customdatatype/datatype/Boolean.java =================================================================== --- api/src/main/java/org/openmrs/customdatatype/datatype/Boolean.java (revision 24282) +++ api/src/main/java/org/openmrs/customdatatype/datatype/Boolean.java (working copy) @@ -14,8 +14,8 @@ package org.openmrs.customdatatype.datatype; import org.apache.commons.lang.StringUtils; -import org.openmrs.customdatatype.CustomDatatype; import org.openmrs.customdatatype.InvalidCustomValueException; +import org.openmrs.customdatatype.SerializingCustomDatatype; import org.springframework.stereotype.Component; /** @@ -23,58 +23,24 @@ * @since 1.9 */ @Component -public class Boolean implements CustomDatatype { - - /** - * @see org.openmrs.customdatatype.CustomDatatype#setConfiguration(java.lang.String) - */ - @Override - public void setConfiguration(String config) { - // not used - } +public class Boolean extends SerializingCustomDatatype { /** - * @see org.openmrs.customdatatype.CustomDatatype#toReferenceString(java.lang.Object) + * @see org.openmrs.customdatatype.SerializingCustomDatatype#serialize(java.lang.Object) */ @Override - public String toReferenceString(java.lang.Boolean typedValue) throws InvalidCustomValueException { + public String serialize(java.lang.Boolean typedValue) { return typedValue.toString(); } /** - * @see org.openmrs.customdatatype.CustomDatatype#fromReferenceString(java.lang.String) + * @see org.openmrs.customdatatype.SerializingCustomDatatype#deserialize(java.lang.String) */ @Override - public java.lang.Boolean fromReferenceString(String persistedValue) throws InvalidCustomValueException { - if (StringUtils.isEmpty(persistedValue)) + public java.lang.Boolean deserialize(String serializedValue) { + if (StringUtils.isEmpty(serializedValue)) return null; - return java.lang.Boolean.valueOf(persistedValue); - } - - /** - * @see org.openmrs.customdatatype.CustomDatatype#render(java.lang.String, java.lang.String) - */ - @Override - public String render(String referenceString, String view) { - return referenceString; - } - - /** - * @see org.openmrs.customdatatype.CustomDatatype#validateReferenceString(java.lang.String) - */ - @Override - public void validateReferenceString(String persistedValue) throws InvalidCustomValueException { - if (!(persistedValue == null || "".equals(persistedValue) || "true".equals(persistedValue) || "false" - .equals(persistedValue))) - throw new InvalidCustomValueException("Must be \"true\" or \"false\""); - } - - /** - * @see org.openmrs.customdatatype.CustomDatatype#validate(java.lang.Object) - */ - @Override - public void validate(java.lang.Boolean typedValue) throws InvalidCustomValueException { - // any java.lang.Boolean is legal + return java.lang.Boolean.valueOf(serializedValue); } } Index: api/src/main/resources/org/openmrs/api/db/hibernate/VisitAttribute.hbm.xml =================================================================== --- api/src/main/resources/org/openmrs/api/db/hibernate/VisitAttribute.hbm.xml (revision 24282) +++ api/src/main/resources/org/openmrs/api/db/hibernate/VisitAttribute.hbm.xml (working copy) @@ -20,7 +20,7 @@ - + Index: api/src/main/java/org/openmrs/customdatatype/NotYetPersistedException.java =================================================================== --- api/src/main/java/org/openmrs/customdatatype/NotYetPersistedException.java (revision 0) +++ api/src/main/java/org/openmrs/customdatatype/NotYetPersistedException.java (revision 0) @@ -0,0 +1,23 @@ +/** + * The contents of this file are subject to the OpenMRS Public License + * Version 1.0 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * http://license.openmrs.org + * + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + * License for the specific language governing rights and limitations + * under the License. + * + * Copyright (C) OpenMRS, LLC. All Rights Reserved. + */ +package org.openmrs.customdatatype; + +import org.openmrs.api.APIException; + +/** + * Indicates that you tried to access the valueReference of a {@link SingleCustomValue} that has not yet been persisted + */ +public class NotYetPersistedException extends APIException { + +} Index: api/src/test/java/org/openmrs/reporting/export/DataExportTest.java =================================================================== --- api/src/test/java/org/openmrs/reporting/export/DataExportTest.java (revision 24282) +++ api/src/test/java/org/openmrs/reporting/export/DataExportTest.java (working copy) @@ -627,7 +627,7 @@ DataExportUtil.generateExport(export, patients, "\t", null); File exportFile = DataExportUtil.getGeneratedFile(export); - String expectedOutput = "PATIENT_ID \"FOOD ASSISTANCE\" \"DATE OF FOOD ASSISTANCE\" \"FAVORITE FOOD, NON-CODED\" \"WEIGHT\"\n7 1.0 14/08/2008 PB and J 50.0\n8 \n"; + String expectedOutput = "PATIENT_ID \"FOOD ASSISTANCE\" \"DATE OF FOOD ASSISTANCE\" \"FAVORITE FOOD, NON-CODED\" \"WEIGHT\"\n7 YES 14/08/2008 PB and J 50.0\n8 \n"; String output = OpenmrsUtil.getFileAsString(exportFile); exportFile.delete(); Index: web/src/main/java/org/openmrs/web/controller/maintenance/SettingsController.java =================================================================== --- web/src/main/java/org/openmrs/web/controller/maintenance/SettingsController.java (revision 24282) +++ web/src/main/java/org/openmrs/web/controller/maintenance/SettingsController.java (working copy) @@ -76,7 +76,7 @@ try { Object value = WebAttributeUtil.getValue(request, dt, handler, "settings[" + i + "].globalProperty.propertyValue"); - property.getGlobalProperty().setPropertyValue(dt.toReferenceString(value)); + property.getGlobalProperty().setValue(value); } catch (Exception ex) { String originalValue = request.getParameter("originalValue[" + i + "]"); Index: api/src/main/java/org/openmrs/api/db/hibernate/HibernateAdministrationDAO.java =================================================================== --- api/src/main/java/org/openmrs/api/db/hibernate/HibernateAdministrationDAO.java (revision 24282) +++ api/src/main/java/org/openmrs/api/db/hibernate/HibernateAdministrationDAO.java (working copy) @@ -27,6 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Criteria; +import org.hibernate.FlushMode; import org.hibernate.SessionFactory; import org.hibernate.cfg.Configuration; import org.hibernate.criterion.MatchMode; @@ -45,10 +46,11 @@ import org.openmrs.reporting.ReportObjectWrapper; import org.openmrs.util.DatabaseUtil; import org.openmrs.util.OpenmrsConstants; +import org.openmrs.validator.ValidateUtil; /** * Hibernate specific database methods for the AdministrationService - * + * * @see org.openmrs.api.context.Context * @see org.openmrs.api.db.AdministrationDAO * @see org.openmrs.api.AdministrationService @@ -69,7 +71,7 @@ /** * Set session factory - * + * * @param sessionFactory */ public void setSessionFactory(SessionFactory sessionFactory) { @@ -330,4 +332,17 @@ PersistentClass persistentClass = configuration.getClassMapping(aClass.getName()); return persistentClass.getTable().getColumn(new Column(fieldName)).getLength(); } + + /** + * @see org.openmrs.api.db.AdministrationDAO#validateInManualFlushMode(java.lang.Object) + */ + @Override + public void validateInManualFlushMode(Object object) { + FlushMode previousFlushMode = sessionFactory.getCurrentSession().getFlushMode(); + sessionFactory.getCurrentSession().setFlushMode(FlushMode.MANUAL); + + ValidateUtil.validate(object); + + sessionFactory.getCurrentSession().setFlushMode(previousFlushMode); + } } Index: api/src/main/java/org/openmrs/BaseCustomizableMetadata.java =================================================================== --- api/src/main/java/org/openmrs/BaseCustomizableMetadata.java (revision 24282) +++ api/src/main/java/org/openmrs/BaseCustomizableMetadata.java (working copy) @@ -30,7 +30,7 @@ */ public abstract class BaseCustomizableMetadata extends BaseOpenmrsMetadata implements Customizable { - private Set attributes; + private Set attributes = new LinkedHashSet(); /** * @see org.openmrs.customdatatype.Customizable#getAttributes() Index: api/src/main/java/org/openmrs/reporting/export/DataExportFunctions.java =================================================================== --- api/src/main/java/org/openmrs/reporting/export/DataExportFunctions.java (revision 24282) +++ api/src/main/java/org/openmrs/reporting/export/DataExportFunctions.java (working copy) @@ -37,6 +37,7 @@ import org.openmrs.Encounter; import org.openmrs.EncounterType; import org.openmrs.Location; +import org.openmrs.Obs; import org.openmrs.Patient; import org.openmrs.PatientIdentifier; import org.openmrs.PatientIdentifierType; @@ -1186,6 +1187,8 @@ return ((EncounterType) o).getName(); else if (o instanceof Date) return formatDate(null, (Date) o); + else if (o instanceof Obs) + return ((Obs) o).getValueAsString(Context.getLocale()); else return o.toString(); } Index: api/src/main/resources/org/openmrs/api/db/hibernate/ProviderAttribute.hbm.xml =================================================================== --- api/src/main/resources/org/openmrs/api/db/hibernate/ProviderAttribute.hbm.xml (revision 24282) +++ api/src/main/resources/org/openmrs/api/db/hibernate/ProviderAttribute.hbm.xml (working copy) @@ -18,7 +18,7 @@ - + Index: api/src/main/java/org/openmrs/api/impl/ProviderServiceImpl.java =================================================================== --- api/src/main/java/org/openmrs/api/impl/ProviderServiceImpl.java (revision 24282) +++ api/src/main/java/org/openmrs/api/impl/ProviderServiceImpl.java (working copy) @@ -101,12 +101,7 @@ */ @Override public Provider saveProvider(Provider provider) { - //remove this validation when TRUNK-2393 is done - Errors errors = new BindException(provider, "provider"); - new ProviderValidator().validate(provider, errors); - if (errors.hasErrors()) - throw new APIException(Context.getMessageSourceService().getMessage("error.foundValidationErrors")); - + CustomDatatypeUtil.saveAttributesIfNecessary(provider); return dao.saveProvider(provider); } Index: api/src/main/java/org/openmrs/validator/UserValidator.java =================================================================== --- api/src/main/java/org/openmrs/validator/UserValidator.java (revision 24282) +++ api/src/main/java/org/openmrs/validator/UserValidator.java (working copy) @@ -105,7 +105,12 @@ * @should not validate when username is whitespace only */ public boolean isUserNameValid(String username) { - //Initialize reg ex for userName pattern + //Initialize reg ex for userName pattern + // ^ = start of line + // \w = [a-zA-Z_0-9] + // \Q = quote everything until \E + // $ = end of line + // complete meaning = 2-50 characters, the first must be a letter, digit, or _, and the rest may also be - or . String expression = "^[\\w][\\Q_\\E\\w-\\.]{1,49}$"; // empty usernames are allowed Index: api/src/main/java/org/openmrs/api/impl/AdministrationServiceImpl.java =================================================================== --- api/src/main/java/org/openmrs/api/impl/AdministrationServiceImpl.java (revision 24282) +++ api/src/main/java/org/openmrs/api/impl/AdministrationServiceImpl.java (working copy) @@ -58,6 +58,8 @@ import org.openmrs.api.GlobalPropertyListener; import org.openmrs.api.context.Context; import org.openmrs.api.db.AdministrationDAO; +import org.openmrs.customdatatype.CustomDatatypeUtil; +import org.openmrs.customdatatype.SingleCustomValue; import org.openmrs.module.Module; import org.openmrs.module.ModuleFactory; import org.openmrs.module.ModuleUtil; @@ -67,6 +69,7 @@ import org.openmrs.util.OpenmrsConstants; import org.openmrs.util.OpenmrsUtil; import org.openmrs.util.PrivilegeConstants; +import org.openmrs.validator.ValidateUtil; import org.springframework.util.StringUtils; /** @@ -775,9 +778,9 @@ * @see org.openmrs.api.AdministrationService#saveGlobalProperty(org.openmrs.GlobalProperty) */ public GlobalProperty saveGlobalProperty(GlobalProperty gp) throws APIException { - // only try to save it if the global property has a key if (gp.getProperty() != null && gp.getProperty().length() > 0) { + CustomDatatypeUtil.saveIfDirty(gp); dao.saveGlobalProperty(gp); notifyGlobalPropertyChange(gp); return gp; @@ -1212,4 +1215,12 @@ public int getMaximumPropertyLength(Class aClass, String fieldName) { return dao.getMaximumPropertyLength(aClass, fieldName); } + + /** + * @see org.openmrs.api.AdministrationService#validateInManualFlushMode(java.lang.Object) + */ + @Override + public void validateInManualFlushMode(Object object) { + dao.validateInManualFlushMode(object); + } } Index: api/src/test/java/org/openmrs/api/ConceptServiceTest.java =================================================================== --- api/src/test/java/org/openmrs/api/ConceptServiceTest.java (revision 24282) +++ api/src/test/java/org/openmrs/api/ConceptServiceTest.java (working copy) @@ -1072,8 +1072,9 @@ assertNotNull(concept); ObsService obsService = Context.getObsService(); - obsService.saveObs(new Obs(new Person(1), concept, new Date(), new Location(1)), - "Creating a new observation with a concept"); + Obs obs = new Obs(new Person(1), concept, new Date(), new Location(1)); + obs.setValueCoded(Context.getConceptService().getConcept(7)); + obsService.saveObs(obs, "Creating a new observation with a concept"); ConceptDatatype newDatatype = conceptService.getConceptDatatypeByName("Text"); concept.setDatatype(newDatatype); @@ -1095,8 +1096,9 @@ assertNotNull(concept); ObsService obsService = Context.getObsService(); - obsService.saveObs(new Obs(new Person(1), concept, new Date(), new Location(1)), - "Creating a new observation with a concept"); + Obs obs = new Obs(new Person(1), concept, new Date(), new Location(1)); + obs.setValueCoded(Context.getConceptService().getConcept(7)); + obsService.saveObs(obs, "Creating a new observation with a concept"); conceptService.saveConcept(concept); } @@ -1260,7 +1262,7 @@ @Verifies(value = "should fail if any of the conceptNames of the concept is being used by an obs", method = "purgeConcept(Concept)") public void purgeConcept_shouldFailIfAnyOfTheConceptNamesOfTheConceptIsBeingUsedByAnObs() throws Exception { Obs o = new Obs(); - o.setConcept(new Concept(3)); + o.setConcept(Context.getConceptService().getConcept(3)); o.setPerson(new Patient(2)); o.setEncounter(new Encounter(3)); o.setObsDatetime(new Date()); Index: api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientSetDAO.java =================================================================== --- api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientSetDAO.java (revision 24282) +++ api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientSetDAO.java (working copy) @@ -579,7 +579,6 @@ String stringValue = null; Concept codedValue = null; Date dateValue = null; - Boolean booleanValue = null; String valueSql = null; if (value != null) { if (concept == null) { @@ -619,11 +618,18 @@ } valueSql = "o.value_datetime"; } else if (concept.getDatatype().isBoolean()) { - if (value instanceof Boolean) - booleanValue = (Boolean) value; - else - booleanValue = Boolean.valueOf(value.toString()); - valueSql = "o.value_numeric"; + if (value instanceof Concept) { + codedValue = (Concept) value; + } else { + boolean asBoolean = false; + if (value instanceof Boolean) + asBoolean = ((Boolean) value).booleanValue(); + else + asBoolean = Boolean.valueOf(value.toString()); + codedValue = asBoolean ? Context.getConceptService().getTrueConcept() : Context.getConceptService() + .getFalseConcept(); + } + valueSql = "o.value_coded"; } } @@ -699,8 +705,6 @@ query.setString("value", stringValue); else if (dateValue != null) query.setDate("value", dateValue); - else if (booleanValue != null) - query.setDouble("value", booleanValue ? 1.0 : 0.0); else throw new IllegalArgumentException( "useValue is true, but numeric, coded, string, boolean, and date values are all null"); @@ -1236,7 +1240,7 @@ List columns = new Vector(); if (abbrev.equals("BIT")) - columns.add("valueNumeric"); + columns.add("valueCoded"); else if (abbrev.equals("CWE")) { columns.add("valueDrug"); columns.add("valueCoded");