=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java 2013-08-29 18:09:46 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java 2013-09-04 12:45:06 +0000 @@ -28,6 +28,18 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonView; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import org.apache.commons.lang.Validate; +import org.hisp.dhis.common.view.DetailedView; +import org.hisp.dhis.user.User; +import org.hisp.dhis.user.UserGroupAccess; + import java.util.Collection; import java.util.Date; import java.util.HashMap; @@ -35,18 +47,6 @@ import java.util.Map; import java.util.Set; -import org.apache.commons.lang.Validate; -import org.hisp.dhis.common.view.DetailedView; -import org.hisp.dhis.user.User; -import org.hisp.dhis.user.UserGroupAccess; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonView; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; - /** * @author Bob Jolliffe */ @@ -276,13 +276,11 @@ this.externalAccess = externalAccess == null ? false : externalAccess; } - /* @Override @JsonProperty - @JsonView({ DetailedView.class, ExportView.class }) - @JsonSerialize(as = BaseIdentifiableObject.class) - @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0) - */ + @JsonView( { DetailedView.class } ) + @JsonSerialize( as = BaseIdentifiableObject.class ) + @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) public User getUser() { return user;