dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21876
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2016-02-04 09:33:02 +0700
message:
  remove order from export params, should be part of Query instead
modified:
  dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/MetadataExportParams.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/metadata2/MetadataExportParams.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/MetadataExportParams.java	2016-02-03 07:29:14 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/MetadataExportParams.java	2016-02-04 02:33:02 +0000
@@ -30,7 +30,6 @@
 
 import com.google.common.collect.Lists;
 import org.hisp.dhis.common.IdentifiableObject;
-import org.hisp.dhis.query.Order;
 import org.hisp.dhis.query.Query;
 
 import java.util.ArrayList;
@@ -49,8 +48,6 @@
 
     private Map<Class<? extends IdentifiableObject>, Query> queries = new HashMap<>();
 
-    private Map<Class<? extends IdentifiableObject>, List<Order>> orders = new HashMap<>();
-
     private Map<Class<? extends IdentifiableObject>, List<String>> fields = new HashMap<>();
 
     private List<String> defaultFields = Lists.newArrayList( ":owner" );
@@ -96,19 +93,6 @@
         return queries.get( klass );
     }
 
-    public MetadataExportParams addOrder( Class<? extends IdentifiableObject> klass, Order order )
-    {
-        if ( !orders.containsKey( klass ) ) orders.put( klass, new ArrayList<>() );
-
-        orders.get( klass ).add( order );
-        return this;
-    }
-
-    public Map<Class<? extends IdentifiableObject>, List<Order>> getOrders()
-    {
-        return orders;
-    }
-
     public MetadataExportParams addFields( Class<? extends IdentifiableObject> klass, List<String> classFields )
     {
         if ( !fields.containsKey( klass ) ) fields.put( klass, classFields );