dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17066
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2014-10-12 17:32:30 +0700
message:
  minor change in CompleteDataSetRegistrations class, enable use of useWrapping (set to false)
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrations.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/CompleteDataSetRegistrationController.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/CompleteDataSetRegistrations.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrations.java	2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrations.java	2014-10-12 10:32:30 +0000
@@ -43,22 +43,22 @@
 @JacksonXmlRootElement( localName = "completeDataSetRegistrations", namespace = DxfNamespaces.DXF_2_0 )
 public class CompleteDataSetRegistrations
 {
-    private List<CompleteDataSetRegistration> completeDataSetRegistrationList = new ArrayList<>();
+    private List<CompleteDataSetRegistration> completeDataSetRegistrations = new ArrayList<>();
 
     public CompleteDataSetRegistrations()
     {
     }
 
     @JsonProperty
-    @JacksonXmlElementWrapper( localName = "completeDataSetRegistrationList", namespace = DxfNamespaces.DXF_2_0 )
+    @JacksonXmlElementWrapper( useWrapping = false, namespace = DxfNamespaces.DXF_2_0 )
     @JacksonXmlProperty( localName = "completeDataSetRegistration", namespace = DxfNamespaces.DXF_2_0 )
-    public List<CompleteDataSetRegistration> getCompleteDataSetRegistrationList()
+    public List<CompleteDataSetRegistration> getCompleteDataSetRegistrations()
     {
-        return completeDataSetRegistrationList;
+        return completeDataSetRegistrations;
     }
 
-    public void setCompleteDataSetRegistrationList( List<CompleteDataSetRegistration> completeDataSetRegistrationList )
+    public void setCompleteDataSetRegistrations( List<CompleteDataSetRegistration> completeDataSetRegistrations )
     {
-        this.completeDataSetRegistrationList = completeDataSetRegistrationList;
+        this.completeDataSetRegistrations = completeDataSetRegistrations;
     }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/CompleteDataSetRegistrationController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/CompleteDataSetRegistrationController.java	2014-08-14 05:46:19 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/CompleteDataSetRegistrationController.java	2014-10-12 10:32:30 +0000
@@ -167,7 +167,7 @@
         dataSets.addAll( manager.getByUid( DataSet.class, dataSet ) );
 
         CompleteDataSetRegistrations completeDataSetRegistrations = new CompleteDataSetRegistrations();
-        completeDataSetRegistrations.setCompleteDataSetRegistrationList( new ArrayList<>(
+        completeDataSetRegistrations.setCompleteDataSetRegistrations( new ArrayList<>(
             registrationService.getCompleteDataSetRegistrations( dataSets, organisationUnits, periods ) ) );
 
         return completeDataSetRegistrations;