=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/Schema.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/Schema.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/Schema.java 2014-03-21 08:43:32 +0000 @@ -29,11 +29,15 @@ */ 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 com.google.common.collect.Lists; +import org.hisp.dhis.common.BaseIdentifiableObject; import org.hisp.dhis.common.DxfNamespaces; +import org.hisp.dhis.common.view.DetailedView; import java.util.List; @@ -49,6 +53,14 @@ private String plural; + private boolean shareable; + + private List publicAuthorities = Lists.newArrayList(); + + private List privateAuthorities = Lists.newArrayList(); + + private List externalAuthorities = Lists.newArrayList(); + private boolean importable; private boolean exportable; @@ -109,6 +121,57 @@ @JsonProperty @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) + public boolean isShareable() + { + return shareable; + } + + public void setShareable( boolean shareable ) + { + this.shareable = shareable; + } + + @JsonProperty + @JacksonXmlElementWrapper( localName = "publicAuthorities", namespace = DxfNamespaces.DXF_2_0 ) + @JacksonXmlProperty( localName = "publicAuthority", namespace = DxfNamespaces.DXF_2_0 ) + public List getPublicAuthorities() + { + return publicAuthorities; + } + + public void setPublicAuthorities( List publicAuthorities ) + { + this.publicAuthorities = publicAuthorities; + } + + @JsonProperty + @JacksonXmlElementWrapper( localName = "privateAuthorities", namespace = DxfNamespaces.DXF_2_0 ) + @JacksonXmlProperty( localName = "privateAuthority", namespace = DxfNamespaces.DXF_2_0 ) + public List getPrivateAuthorities() + { + return privateAuthorities; + } + + public void setPrivateAuthorities( List privateAuthorities ) + { + this.privateAuthorities = privateAuthorities; + } + + @JsonProperty + @JacksonXmlElementWrapper( localName = "externalAuthorities", namespace = DxfNamespaces.DXF_2_0 ) + @JacksonXmlProperty( localName = "externalAuthority", namespace = DxfNamespaces.DXF_2_0 ) + public List getExternalAuthorities() + { + return externalAuthorities; + } + + public void setExternalAuthorities( List externalAuthorities ) + { + this.externalAuthorities = externalAuthorities; + } + + @JsonProperty + @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) public boolean isImportable() { return importable;