------------------------------------------------------------
revno: 12242
committer: Morten Olav Hansen <[email protected]>
branch nick: dhis2
timestamp: Wed 2013-09-25 16:17:37 +0200
message:
Minor namespace fixes
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistration.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistration.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistration.java 2013-09-25 14:13:04 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistration.java 2013-09-25 14:17:37 +0000
@@ -30,6 +30,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
import org.hisp.dhis.common.BaseIdentifiableObject;
import org.hisp.dhis.common.DxfNamespaces;
@@ -177,6 +178,7 @@
@JsonProperty
@JsonSerialize(as = BaseIdentifiableObject.class)
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public DataSet getDataSet()
{
return dataSet;
@@ -189,6 +191,7 @@
@JsonProperty
@JsonSerialize(as = BaseIdentifiableObject.class)
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public Period getPeriod()
{
return period;
@@ -199,8 +202,9 @@
this.period = period;
}
- @JsonProperty(value = "organisationUnit")
+ @JsonProperty( value = "organisationUnit" )
@JsonSerialize(as = BaseIdentifiableObject.class)
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public OrganisationUnit getSource()
{
return source;
@@ -212,6 +216,7 @@
}
@JsonProperty
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public Date getDate()
{
return date;
@@ -223,6 +228,7 @@
}
@JsonProperty
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public String getStoredBy()
{
return storedBy;
@@ -234,6 +240,7 @@
}
@JsonProperty
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public String getPeriodName()
{
return periodName;
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
