=== modified file 'dhis-2/dhis-services/dhis-service-analytics/pom.xml'
--- dhis-2/dhis-services/dhis-service-analytics/pom.xml 2016-01-15 00:52:40 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/pom.xml 2016-03-15 08:41:27 +0000
@@ -27,10 +27,6 @@
org.hisp.dhis
- dhis-service-dxf2
-
-
- org.hisp.dhis
dhis-service-administration
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java 2016-02-27 12:02:42 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java 2016-03-15 08:41:27 +0000
@@ -75,7 +75,6 @@
import org.hisp.dhis.dataelement.DataElementCategoryCombo;
import org.hisp.dhis.dataelement.DataElementGroupSet;
import org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.dxf2.common.JacksonUtils;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupSet;
import org.hisp.dhis.period.Period;
@@ -1226,7 +1225,7 @@
map.put( "Filters", filters );
map.put( "Aggregation type", aggregationType );
- return JacksonUtils.toJsonAsStringSilent( map );
+ return map.toString(); //TODO
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventQueryParams.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventQueryParams.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventQueryParams.java 2016-03-15 08:41:27 +0000
@@ -52,7 +52,6 @@
import org.hisp.dhis.common.QueryItem;
import org.hisp.dhis.commons.collection.ListUtils;
import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dxf2.common.JacksonUtils;
import org.hisp.dhis.legend.Legend;
import org.hisp.dhis.option.OptionSet;
import org.hisp.dhis.organisationunit.OrganisationUnit;
@@ -532,7 +531,7 @@
map.put( "Dimensions", dimensions );
map.put( "Filters", filters );
- return JacksonUtils.toJsonAsStringSilent( map );
+ return map.toString(); //TODO
}
// -------------------------------------------------------------------------