=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValue.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValue.java 2015-02-18 09:16:25 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValue.java 2015-11-30 00:34:24 +0000 @@ -56,8 +56,6 @@ */ private static final long serialVersionUID = -4469496681709547707L; - public static final String UNKNOWN = " "; - private TrackedEntityAttribute attribute; private TrackedEntityInstance entityInstance; === added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueAudit.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueAudit.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueAudit.java 2015-11-30 00:34:24 +0000 @@ -0,0 +1,158 @@ +package org.hisp.dhis.trackedentityattributevalue; + +/* + * Copyright (c) 2004-2015, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import org.hisp.dhis.common.AuditType; +import org.hisp.dhis.common.DxfNamespaces; +import org.hisp.dhis.trackedentity.TrackedEntityAttribute; +import org.hisp.dhis.trackedentity.TrackedEntityInstance; + +import java.io.Serializable; +import java.util.Objects; + +/** + * @author Morten Olav Hansen + */ +@JacksonXmlRootElement( localName = "trackedEntityAttributeValueAudit", namespace = DxfNamespaces.DXF_2_0 ) +public class TrackedEntityAttributeValueAudit + implements Serializable +{ + private int id; + + private TrackedEntityAttribute attribute; + + private TrackedEntityInstance entityInstance; + + private String value; + + private String modifiedBy; + + private AuditType auditType; + + public TrackedEntityAttributeValueAudit( TrackedEntityAttributeValue trackedEntityAttributeValue, String value, String modifiedBy, AuditType auditType ) + { + this.attribute = trackedEntityAttributeValue.getAttribute(); + this.entityInstance = trackedEntityAttributeValue.getEntityInstance(); + + this.value = value; + this.modifiedBy = modifiedBy; + this.auditType = auditType; + } + + @Override + public int hashCode() + { + return Objects.hash( attribute, entityInstance, value, modifiedBy, auditType ); + } + + @Override + public boolean equals( Object obj ) + { + if ( this == obj ) + { + return true; + } + + if ( obj == null || getClass() != obj.getClass() ) + { + return false; + } + + final TrackedEntityAttributeValueAudit other = (TrackedEntityAttributeValueAudit) obj; + + return Objects.equals( this.attribute, other.attribute ) + && Objects.equals( this.entityInstance, other.entityInstance ) + && Objects.equals( this.value, other.value ) + && Objects.equals( this.modifiedBy, other.modifiedBy ) + && Objects.equals( this.auditType, other.auditType ); + } + + @JsonProperty( "trackedEntityAttribute" ) + @JacksonXmlProperty( localName = "trackedEntityAttribute", namespace = DxfNamespaces.DXF_2_0 ) + public TrackedEntityAttribute getAttribute() + { + return attribute; + } + + public void setAttribute( TrackedEntityAttribute attribute ) + { + this.attribute = attribute; + } + + @JsonProperty( "trackedEntityInstance" ) + @JacksonXmlProperty( localName = "trackedEntityInstance", namespace = DxfNamespaces.DXF_2_0 ) + public TrackedEntityInstance getEntityInstance() + { + return entityInstance; + } + + public void setEntityInstance( TrackedEntityInstance entityInstance ) + { + this.entityInstance = entityInstance; + } + + @JsonProperty + @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) + public String getValue() + { + return value; + } + + public void setValue( String value ) + { + this.value = value; + } + + @JsonProperty + @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) + public String getModifiedBy() + { + return modifiedBy; + } + + public void setModifiedBy( String modifiedBy ) + { + this.modifiedBy = modifiedBy; + } + + @JsonProperty + @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) + public AuditType getAuditType() + { + return auditType; + } + + public void setAuditType( AuditType auditType ) + { + this.auditType = auditType; + } +} === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValue.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValue.java 2015-11-27 09:35:15 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValue.java 2015-11-30 00:34:24 +0000 @@ -28,15 +28,18 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import org.hisp.dhis.common.DxfNamespaces; +import org.hisp.dhis.dataelement.DataElement; +import org.hisp.dhis.program.ProgramStageInstance; + import java.io.Serializable; import java.util.Date; -import org.hisp.dhis.dataelement.DataElement; -import org.hisp.dhis.program.ProgramStageInstance; - /** * @author Abyot Asalefew Gizaw */ +@JacksonXmlRootElement( localName = "trackedEntityDataValue", namespace = DxfNamespaces.DXF_2_0 ) public class TrackedEntityDataValue implements Serializable { === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValueAudit.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValueAudit.java 2015-11-27 15:24:32 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValueAudit.java 2015-11-30 00:34:24 +0000 @@ -30,6 +30,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import org.hisp.dhis.common.AuditType; import org.hisp.dhis.common.DxfNamespaces; import org.hisp.dhis.dataelement.DataElement; @@ -42,11 +43,12 @@ /** * @author Morten Olav Hansen */ +@JacksonXmlRootElement( localName = "trackedEntityDataValueAudit", namespace = DxfNamespaces.DXF_2_0 ) public class TrackedEntityDataValueAudit implements Serializable { private int id; - + private DataElement dataElement; private ProgramStageInstance programStageInstance; @@ -65,10 +67,6 @@ // Constructors // ------------------------------------------------------------------------- - public TrackedEntityDataValueAudit() - { - } - public TrackedEntityDataValueAudit( TrackedEntityDataValue trackedEntityDataValue, String value, String modifiedBy, Date timestamp, AuditType auditType ) { this.dataElement = trackedEntityDataValue.getDataElement();