dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17446
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-11-12 11:57:21 +0545
message:
  minor fix, ignore event metadata on deserialization
modified:
  dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/Events.java
  dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/event/ImportEventAction.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-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/Events.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/Events.java	2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/Events.java	2014-11-12 06:12:21 +0000
@@ -32,6 +32,7 @@
 import java.util.List;
 import java.util.Map;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import org.hisp.dhis.common.DxfNamespaces;
 import org.hisp.dhis.common.Pager;
@@ -104,6 +105,7 @@
         return metaData;
     }
 
+    @JsonIgnore
     public void setMetaData( Map<Object, Object> metaData )
     {
         this.metaData = metaData;
@@ -116,6 +118,7 @@
         return pager;
     }
 
+    @JsonIgnore
     public void setPager( Pager pager )
     {
         this.pager = pager;

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/event/ImportEventAction.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/event/ImportEventAction.java	2014-11-11 06:42:33 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/event/ImportEventAction.java	2014-11-12 06:12:21 +0000
@@ -52,6 +52,12 @@
  */
 public class ImportEventAction implements Action
 {
+    public static final String FORMAT_CSV = "csv";
+
+    public static final String FORMAT_JSON = "json";
+
+    public static final String FORMAT_XML = "xml";
+
     // -------------------------------------------------------------------------
     // Dependencies
     // -------------------------------------------------------------------------
@@ -128,14 +134,14 @@
         importOptions.setDryRun( dryRun );
         importOptions.setOrgUnitIdScheme( orgUnitIdScheme );
 
-        if ( "csv".equals( payloadFormat ) )
+        if ( FORMAT_CSV.equals( payloadFormat ) )
         {
             Events events = csvEventService.readEvents( in, skipFirst );
             scheduler.executeTask( new ImportEventsTask( events.getEvents(), eventService, importOptions, taskId ) );
         }
         else
         {
-            boolean jsonInput = "json".equals( payloadFormat );
+            boolean jsonInput = FORMAT_JSON.equals( payloadFormat );
             scheduler.executeTask( new ImportEventTask( in, eventService, importOptions, taskId, jsonInput ) );
         }