dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #34616
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 17749: Minor fixes
------------------------------------------------------------
revno: 17749
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-12-19 16:47:38 +0100
message:
Minor fixes
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/Dashboard.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItem.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroup.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSet.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/Document.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/dashboard/Dashboard.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/Dashboard.java 2014-09-12 11:14:27 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/Dashboard.java 2014-12-19 15:47:38 +0000
@@ -175,7 +175,7 @@
// Getters and setters
// -------------------------------------------------------------------------
- @JsonProperty( value = "dashboardItems" )
+ @JsonProperty( "dashboardItems" )
@JsonSerialize( contentAs = BaseIdentifiableObject.class )
@JsonView( { DetailedView.class, ExportView.class } )
@JacksonXmlElementWrapper( localName = "dashboardItems", namespace = DxfNamespaces.DXF_2_0 )
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItem.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItem.java 2014-09-14 07:06:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItem.java 2014-12-19 15:47:38 +0000
@@ -34,7 +34,6 @@
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.hisp.dhis.chart.Chart;
import org.hisp.dhis.common.BaseIdentifiableObject;
import org.hisp.dhis.common.DxfNamespaces;
@@ -297,12 +296,12 @@
{
return eventChart;
}
-
+
public void setEventChart( EventChart eventChart )
{
this.eventChart = eventChart;
}
-
+
@JsonProperty
@JsonView( { DetailedView.class, ExportView.class } )
@JsonSerialize( as = BaseIdentifiableObject.class )
@@ -331,7 +330,7 @@
this.reportTable = reportTable;
}
- @JsonProperty( value = "users" )
+ @JsonProperty( "users" )
@JsonView( { DetailedView.class, ExportView.class } )
@JsonSerialize( contentAs = BaseIdentifiableObject.class )
@JacksonXmlElementWrapper( localName = "users", namespace = DxfNamespaces.DXF_2_0 )
@@ -346,7 +345,7 @@
this.users = users;
}
- @JsonProperty( value = "reportTables" )
+ @JsonProperty( "reportTables" )
@JsonView( { DetailedView.class, ExportView.class } )
@JsonSerialize( contentAs = BaseIdentifiableObject.class )
@JacksonXmlElementWrapper( localName = "reportTables", namespace = DxfNamespaces.DXF_2_0 )
@@ -361,7 +360,7 @@
this.reportTables = reportTables;
}
- @JsonProperty( value = "reports" )
+ @JsonProperty( "reports" )
@JsonView( { DetailedView.class, ExportView.class } )
@JsonSerialize( contentAs = BaseIdentifiableObject.class )
@JacksonXmlElementWrapper( localName = "reports", namespace = DxfNamespaces.DXF_2_0 )
@@ -376,7 +375,7 @@
this.reports = reports;
}
- @JsonProperty( value = "resources" )
+ @JsonProperty( "resources" )
@JsonView( { DetailedView.class, ExportView.class } )
@JsonSerialize( contentAs = BaseIdentifiableObject.class )
@JacksonXmlElementWrapper( localName = "resources", namespace = DxfNamespaces.DXF_2_0 )
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java 2014-12-19 15:36:44 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java 2014-12-19 15:47:38 +0000
@@ -585,7 +585,7 @@
this.url = url;
}
- @JsonProperty( value = "dataElementGroups" )
+ @JsonProperty( "dataElementGroups" )
@JsonSerialize( contentAs = BaseIdentifiableObject.class )
@JsonView( { DetailedView.class } )
@JacksonXmlElementWrapper( localName = "dataElementGroups", namespace = DxfNamespaces.DXF_2_0 )
@@ -654,7 +654,7 @@
this.numberType = numberType;
}
- @JsonProperty( value = "attributeValues" )
+ @JsonProperty( "attributeValues" )
@JsonView( { DetailedView.class, ExportView.class } )
@JacksonXmlElementWrapper( localName = "attributeValues", namespace = DxfNamespaces.DXF_2_0 )
@JacksonXmlProperty( localName = "attributeValue", namespace = DxfNamespaces.DXF_2_0 )
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroup.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroup.java 2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroup.java 2014-12-19 15:47:38 +0000
@@ -157,7 +157,7 @@
// Getters and setters
// -------------------------------------------------------------------------
- @JsonProperty( value = "dataElements" )
+ @JsonProperty( "dataElements" )
@JsonSerialize( contentAs = BaseIdentifiableObject.class )
@JsonView( { DetailedView.class, ExportView.class } )
@JacksonXmlElementWrapper( localName = "dataElements", namespace = DxfNamespaces.DXF_2_0)
@@ -172,7 +172,7 @@
this.members = members;
}
- @JsonProperty( value = "dataElementGroupSet" )
+ @JsonProperty( "dataElementGroupSet" )
@JsonSerialize( as = BaseIdentifiableObject.class )
@JsonView( { DetailedView.class } )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0)
@@ -186,7 +186,7 @@
this.groupSet = groupSet;
}
- @JsonProperty( value = "attributeValues" )
+ @JsonProperty( "attributeValues" )
@JsonView( { DetailedView.class, ExportView.class } )
@JacksonXmlElementWrapper( localName = "attributeValues", namespace = DxfNamespaces.DXF_2_0)
@JacksonXmlProperty( localName = "attributeValue", namespace = DxfNamespaces.DXF_2_0)
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSet.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSet.java 2014-11-08 17:30:22 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSet.java 2014-12-19 15:47:38 +0000
@@ -57,7 +57,7 @@
*
* @author Lars Helge Overland
*/
-@JacksonXmlRootElement(localName = "dataElementGroupSet", namespace = DxfNamespaces.DXF_2_0)
+@JacksonXmlRootElement( localName = "dataElementGroupSet", namespace = DxfNamespaces.DXF_2_0 )
public class DataElementGroupSet
extends BaseDimensionalObject
{
@@ -194,10 +194,10 @@
@Override
@JsonProperty
- @JsonSerialize(contentAs = BaseIdentifiableObject.class)
- @JsonView({ DimensionalView.class })
- @JacksonXmlElementWrapper(localName = "items", namespace = DxfNamespaces.DXF_2_0)
- @JacksonXmlProperty(localName = "item", namespace = DxfNamespaces.DXF_2_0)
+ @JsonSerialize( contentAs = BaseIdentifiableObject.class )
+ @JsonView( { DimensionalView.class } )
+ @JacksonXmlElementWrapper( localName = "items", namespace = DxfNamespaces.DXF_2_0 )
+ @JacksonXmlProperty( localName = "item", namespace = DxfNamespaces.DXF_2_0 )
public List<NameableObject> getItems()
{
return new ArrayList<NameableObject>( members );
@@ -222,8 +222,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public Boolean isCompulsory()
{
if ( compulsory == null )
@@ -239,11 +239,11 @@
this.compulsory = compulsory;
}
- @JsonProperty(value = "dataElementGroups")
- @JsonSerialize(contentAs = BaseIdentifiableObject.class)
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlElementWrapper(localName = "dataElementGroups", namespace = DxfNamespaces.DXF_2_0)
- @JacksonXmlProperty(localName = "dataElementGroup", namespace = DxfNamespaces.DXF_2_0)
+ @JsonProperty( "dataElementGroups" )
+ @JsonSerialize( contentAs = BaseIdentifiableObject.class )
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlElementWrapper( localName = "dataElementGroups", namespace = DxfNamespaces.DXF_2_0 )
+ @JacksonXmlProperty( localName = "dataElementGroup", namespace = DxfNamespaces.DXF_2_0 )
public List<DataElementGroup> getMembers()
{
return members;
@@ -255,8 +255,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public boolean isDataDimension()
{
return dataDimension;
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java 2014-10-06 09:35:51 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java 2014-12-19 15:47:38 +0000
@@ -28,9 +28,13 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import java.util.HashSet;
-import java.util.Set;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonView;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+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.hisp.dhis.attribute.AttributeValue;
import org.hisp.dhis.common.BaseIdentifiableObject;
import org.hisp.dhis.common.BaseNameableObject;
@@ -55,13 +59,8 @@
import org.hisp.dhis.period.PeriodType;
import org.hisp.dhis.user.UserGroup;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonView;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-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 java.util.HashSet;
+import java.util.Set;
/**
* This class is used for defining the standardized DataSets. A DataSet consists
@@ -368,7 +367,7 @@
@JsonProperty
- @JsonView( { DetailedView.class })
+ @JsonView( { DetailedView.class } )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public String getDataSetType()
{
@@ -664,7 +663,7 @@
this.approveData = approveData;
}
- @JsonProperty( value = "attributeValues" )
+ @JsonProperty( "attributeValues" )
@JsonView( { DetailedView.class, ExportView.class } )
@JacksonXmlElementWrapper( localName = "attributeValues", namespace = DxfNamespaces.DXF_2_0 )
@JacksonXmlProperty( localName = "attributeValue", namespace = DxfNamespaces.DXF_2_0 )
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/Document.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/Document.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/Document.java 2014-12-19 15:47:38 +0000
@@ -37,6 +37,8 @@
import org.hisp.dhis.common.IdentifiableObject;
import org.hisp.dhis.common.view.DetailedView;
import org.hisp.dhis.common.view.ExportView;
+import org.hisp.dhis.schema.PropertyType;
+import org.hisp.dhis.schema.annotation.Property;
/**
* @author Lars Helge Overland
@@ -74,6 +76,7 @@
@JsonProperty
@JsonView( { DetailedView.class, ExportView.class } )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ @Property( PropertyType.URL )
public String getUrl()
{
return url;
